fix: close the motor client if an invalid db name raises in __init__ (mongo-9)

self._client[database] can raise InvalidName after the client is already
built, leaking it via any exception traceback the caller holds. close it
before re-raising, matching the __aenter__ leak fix. also compresses essay
docstrings/comments across the module with no behavior change, keeping the
swallow-and-default contract note and the matched_count/nInserted footguns.

Signed-off-by: disqualifier <dev@disqualifier.me>

README.md

@@ -8,31 +8,39 @@ helpers for the common paths, with a raw escape hatch for everything else.
 `requirements.txt`:
 
 ```
-mongo @ git+ssh://git@git.rethinkstudios.io/rethink-public/mongo.git@v0.1.3
+mongo @ git+ssh://git@git.rethinkstudios.io/rethink-public/mongo.git@v0.1.8
 ```
 
 Direct:
 
 ```bash
-pip install "mongo @ git+ssh://git@git.rethinkstudios.io/rethink-public/mongo.git@v0.1.3"
+pip install "mongo @ git+ssh://git@git.rethinkstudios.io/rethink-public/mongo.git@v0.1.8"
 ```
 
 Requires `motor` and `pymongo` (pulled transitively).
 
-Drop the `@v0.1.3` suffix from the line above to install the latest unpinned.
+Drop the `@v0.1.8` suffix from the line above to install the latest unpinned.
 
 ## Usage
 
 **Object (preferred)** — one client per process:
 
 ```python
-from mongo import Mongo
+from mongo import MongoDB
 
-db = Mongo(conn_string, database)          # attach as bot.db / app.db
+db = MongoDB(conn_string, database)         # attach as bot.db / app.db
+await db.connect()                          # optional: ping to fail-early on a bad URI
 users = await db.get_documents("users", {"active": True})
 db.close()                                  # on shutdown (sync)
+
+# or with guaranteed cleanup:
+async with MongoDB(conn_string, database) as db:
+    await db.get_documents("users", {"active": True})
 ```
 
+The class is `MongoDB`; **`Mongo` remains a back-compat alias** (`Mongo = MongoDB`), so
+existing `Mongo(...)` call sites keep working unchanged.
+
 **Module proxy (back-compat)** — arm once, then call bare:
 
 ```python
@@ -44,10 +52,26 @@ users = await mongo.get_documents("users", {"active": True})
 Both styles share one client. The proxy exists so legacy call sites keep working
 after a one-line `init()`; new code should use the object.
 
+## Naming consistency with the datastore trio
+
+mongo predates the `redis`/`psql`/`mysql` trio; this version makes it surface-consistent
+**without breaking anything** (all additive, every old name preserved):
+
+- class is **`MongoDB`** (with `Mongo` kept as an alias)
+- **`connect()`** + **`async with`** like the trio (motor connects lazily, so `connect()`
+  just pings to validate early)
+- **`exists()`** aliases `check_document_exists()`; **`delete()`** aliases
+  `delete_document()` — old names still work, the trio-consistent names are now available
+
+The one deliberate difference that remains: **mongo swallows** (see below) where the trio
+is **fail-loud**. That's intentional — flipping it would break existing consumers' branch-
+on-result control flow.
+
 ## Error contract
 
 - **Wrapped methods** log-and-swallow exceptions and return a safe default
-  (`False` / `[]` / `{}` / `0` / `None`). Branch on the result.
+  (`False` / `[]` / `{}` / `0` / `None`). Branch on the result. (`connect()` is the
+  exception — it raises on a bad connection so you can fail-early.)
 - **`db.collection(name)`** (or `db[name]`) returns the raw motor collection:
   full driver surface, no swallowing, **raises**. Use it for anything not wrapped
   (`find_one_and_*` beyond what's exposed, change streams, complex bulk ops).
@@ -63,6 +87,9 @@ are included.
 
 - `from mongo import func` won't see the proxy (resolved at import, before `init`).
   Use `import mongo` then `mongo.func(...)`.
+- `create_collection(collection, index=...)` seeds **one** index (the param is `index`,
+  renamed from `indexes` in v0.1.6). A key-spec like `[("a",1),("b",1)]` builds one
+  compound index, not two — call `create_index` per index for multiples.
 - `find_one_and_update` returns the **after** image by default (`return_after=True`).
 - `bulk_write` takes pymongo ops the caller builds:
   ```python

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "mongo"
-version = "0.1.3"
+version = "0.1.8"
 description = "async mongodb wrapper over motor with a raw escape hatch"
 requires-python = ">=3.10"
 dependencies = [

src/mongo/__init__.py

@@ -1,18 +1,17 @@
-from .mongo import Mongo, init, instance
+from .mongo import MongoDB, Mongo, init, instance
 
-__all__ = ["Mongo", "init", "instance"]
+__all__ = ["MongoDB", "Mongo", "init", "instance"]
 
 
 def __getattr__(name: str):
     """proxy bare package attribute access to the default instance (PEP 562)
 
     lets `import mongo; await mongo.get_documents(...)` work after init().
-    `from mongo import func` still won't see this (resolved before init).
-    note: the bare-proxy raw escape hatch is `mongo.collection(name)`, not
-    `mongo[name]` — module-level subscripting isn't a thing in python, so the proxy
-    can only forward named attributes. on a Mongo instance both `db[name]` and
-    `db.collection(name)` work.
+    `from mongo import func` still won't see this (resolved before init). the
+    bare-proxy raw escape hatch is `mongo.collection(name)`, not `mongo[name]` —
+    module-level subscripting isn't a thing in python, so the proxy only forwards
+    named attributes (an instance's `db[name]` still works fine).
     """
-    if not name.startswith("_") and hasattr(Mongo, name):
+    if not name.startswith("_") and hasattr(MongoDB, name):
         return getattr(instance(), name)
     raise AttributeError(f"module {__name__!r} has no attribute {name!r}")

src/mongo/mongo.py

@@ -2,20 +2,35 @@
 async mongodb wrapper over motor
 
 object (preferred), one client per process:
-    from mongo import Mongo
-    bot.db = Mongo(conn_string, database)
+    from mongo import MongoDB
+    bot.db = MongoDB(conn_string, database)
+    await bot.db.connect()                    # optional: ping to fail-early
     await bot.db.get_documents("users", {"active": True})
     bot.db.close()                            # on shutdown (sync)
 
+    # async with (guaranteed cleanup):
+    async with MongoDB(conn_string, database) as db:
+        await db.get_documents("users", {})
+
+`Mongo` is a back-compat alias of `MongoDB`; old `Mongo(...)` call sites still work.
+
 module proxy (back-compat), arm once then call bare:
     import mongo                              # not `from mongo import ...`
     mongo.init(conn_string, database)
     await mongo.get_documents("users", {"active": True})
 
 errors:
-    wrapped methods log and swallow, returning a safe default
-    (False / [] / {} / 0 / None). .collection(name) / db[name] return
-    the raw motor collection: full driver surface, raises, nothing swallowed.
+    wrapped methods log and swallow, returning a safe default (False / [] / {} / 0 /
+    None). .collection(name) / db[name] return the raw motor collection: full driver
+    surface, raises, nothing swallowed. mongo SWALLOWS by design — the one deliberate
+    difference from the fail-loud redis/psql/mysql trio, kept so existing consumers'
+    branch-on-result control flow doesn't break.
+
+naming consistency with the trio (all additive — old names still work):
+    - class is `MongoDB` (was `Mongo`, kept as alias)
+    - `connect()` / `async with` like the trio (motor connects lazily, so connect()
+      just pings to validate early)
+    - `exists()` aliases `check_document_exists()`; `delete()` aliases `delete_document()`
 
 notes:
     - the proxy needs `import mongo`; `from mongo import func` resolves before init
@@ -27,17 +42,52 @@ import logging
 from typing import Any, List, Optional
 
 from pymongo import ReturnDocument
+from pymongo.errors import BulkWriteError
 from motor.motor_asyncio import AsyncIOMotorClient, AsyncIOMotorCollection, AsyncIOMotorDatabase
 
 log = logging.getLogger(__name__)
 
 
-class Mongo:
+class MongoDB:
     """async mongodb wrapper; one client per process, attach to bot as bot.db"""
 
     def __init__(self, connection_string: str, database: str):
+        # motor builds the client eagerly (no I/O yet); a bad URI raises InvalidURI
+        # here with nothing built. an invalid db name raises below, after the client
+        # exists — close it before propagating so it doesn't outlive the raise.
         self._client = AsyncIOMotorClient(connection_string)
-        self._db = self._client[database]
+        try:
+            self._db = self._client[database]
+        except BaseException:
+            self._client.close()
+            raise
+
+    async def connect(self) -> "MongoDB":
+        """validate the connection with a ping and return self
+
+        optional — motor connects lazily, so this just fails early on a bad
+        URI/credentials (parallel to the trio's connect()). raises, unlike the
+        swallowing wrapped methods.
+
+        an instance is single-use: pymongo 4.x `close()` is irreversible and
+        connect() doesn't rebuild the client. construct a fresh MongoDB instead of
+        reusing one after close()/`async with` exit.
+        """
+        await self._client.admin.command("ping")
+        return self
+
+    async def __aenter__(self) -> "MongoDB":
+        try:
+            return await self.connect()
+        except BaseException:
+            # __aexit__ is not called when __aenter__ raises, so a failed ping here
+            # would otherwise leak the motor client built in __init__. close it
+            # before propagating.
+            self.close()
+            raise
+
+    async def __aexit__(self, exc_type, exc, tb) -> None:
+        self.close()
 
     def __getitem__(self, collection: str) -> AsyncIOMotorCollection:
         """raw collection access via subscript: bot.db['users'].aggregate(...)"""
@@ -68,13 +118,17 @@ class Mongo:
     # -------------------------------------------------------------------------
     #   collection / index management
 
-    async def create_collection(self, collection: str, indexes=None) -> bool:
-        """create a collection, optionally seeding an index"""
+    async def create_collection(self, collection: str, index=None) -> bool:
+        """create a collection, optionally seeding ONE index
+
+        `index` is a single index key-spec (e.g. `[("a", 1), ("b", 1)]` builds one
+        compound index, NOT two); call `create_index` per index for multiples.
+        """
         try:
             await self._db.create_collection(collection)
-            if indexes:
-                await self._db[collection].create_index(indexes)
-                log.info(f"created indexes for {collection}")
+            if index:
+                await self._db[collection].create_index(index)
+                log.info(f"created index for {collection}")
             return True
         except Exception:
             log.exception(f"db.create_collection() for {collection}")
@@ -130,10 +184,19 @@ class Mongo:
     async def create_documents(
         self, collection: str, documents: List[dict], ordered: bool = True
     ) -> int:
-        """insert many documents, returning the inserted count"""
+        """insert many documents, returning the inserted count
+
+        on a partial failure (e.g. ordered=False with one duplicate key) the driver
+        raises BulkWriteError AFTER inserting the rest; count comes from
+        `e.details['nInserted']` so a caller retrying on a wrongly-reported 0 doesn't
+        re-insert documents that already landed.
+        """
         try:
             result = await self._db[collection].insert_many(documents, ordered=ordered)
             return len(result.inserted_ids)
+        except BulkWriteError as e:
+            log.exception(f"db.create_documents() on {collection}")
+            return e.details.get("nInserted", 0)
         except Exception:
             log.exception(f"db.create_documents() on {collection}")
             return 0
@@ -224,6 +287,10 @@ class Mongo:
             log.exception(f"db.check_document_exists() on {collection}")
             return False
 
+    async def exists(self, collection: str, target: dict) -> bool:
+        """trio-consistent alias of check_document_exists"""
+        return await self.check_document_exists(collection, target)
+
     async def count_value_in_array(self, collection: str, array_field: str, value: str) -> int:
         """count documents whose array field contains value"""
         try:
@@ -309,9 +376,9 @@ class Mongo:
     async def update_document_field(self, collection: str, target: dict, updates: dict) -> bool:
         """$set one or more fields on a single document
 
-        returns True when a document matched, even if the write changed nothing (a
-        `$set` to the identical value leaves `modified_count=0`); use `matched_count`
-        so an idempotent no-op on an existing doc isn't misread as a failure.
+        returns True when a document matched, even if `$set` to an identical value
+        leaves `modified_count=0` — uses `matched_count` so an idempotent no-op isn't
+        misread as a failure.
         """
         try:
             response = await self._db[collection].update_one(target, {"$set": updates})
@@ -325,9 +392,8 @@ class Mongo:
     ) -> bool:
         """apply raw update operators ($set/$inc/$unset/...) to a single document
 
-        returns True when a document matched, even if the operators changed nothing
-        (e.g. `$set` to an identical value) — use `matched_count` so an idempotent
-        write on an existing doc isn't misread as a failure.
+        returns True when a document matched, even if the operators changed nothing —
+        uses `matched_count` so an idempotent write isn't misread as a failure.
         """
         try:
             response = await self._db[collection].update_one(target, update_query)
@@ -337,12 +403,17 @@ class Mongo:
             return False
 
     async def upsert_document_field(self, collection: str, target: dict, updates: dict) -> bool:
-        """$set fields on a single document, creating it if absent"""
+        """$set fields on a single document, creating it if absent
+
+        returns True when a document matched or was upserted, even if `$set` to an
+        identical value leaves `modified_count=0` — mirrors update_document_field's
+        matched_count-over-modified_count contract.
+        """
         try:
             response = await self._db[collection].update_one(
                 target, {"$set": updates}, upsert=True
             )
-            return bool(response.modified_count or response.upserted_id)
+            return bool(response.matched_count or response.upserted_id)
         except Exception:
             log.exception(f"db.upsert_document_field() on {collection}")
             return False
@@ -363,9 +434,8 @@ class Mongo:
     ) -> bool:
         """$push a value onto an array field
 
-        returns True when a document matched (consistent with the other single-doc
-        update helpers); $push always mutates, so matched_count and modified_count
-        agree here in practice.
+        returns True when a document matched; $push always mutates, so matched_count
+        and modified_count agree here in practice.
         """
         try:
             response = await self._db[collection].update_one(target, {"$push": {array: value}})
@@ -380,8 +450,7 @@ class Mongo:
     ) -> bool:
         """$push to an array and $set a field in one update
 
-        returns True when a document matched (consistent with the other single-doc
-        update helpers).
+        returns True when a document matched (matched_count, not modified_count).
         """
         try:
             response = await self._db[collection].update_one(
@@ -398,9 +467,8 @@ class Mongo:
     ) -> bool:
         """$pull a value from an array field
 
-        returns True when a document matched, even if nothing was pulled (the value
-        was absent) — use `matched_count` so a no-op pull on an existing doc isn't
-        misread as a failure.
+        returns True when a document matched, even if the value was absent and
+        nothing was pulled — uses `matched_count`, not `modified_count`.
         """
         try:
             response = await self._db[collection].update_one(target, {"$pull": {array: value}})
@@ -463,6 +531,10 @@ class Mongo:
             log.exception(f"db.delete_document() on {collection}")
             return 0
 
+    async def delete(self, collection: str, target: dict) -> int:
+        """trio-consistent alias of delete_document (single-document delete)"""
+        return await self.delete_document(collection, target)
+
     async def delete_documents(self, collection: str, target: dict) -> int:
         """delete all matching documents, returning deleted count"""
         try:
@@ -476,10 +548,9 @@ class Mongo:
     #   bulk / checks
 
     async def bulk_write(self, collection: str, operations: list, ordered: bool = True) -> dict:
-        """
-        run a batch of pymongo write ops (InsertOne/UpdateOne/DeleteOne/...)
+        """run a batch of pymongo write ops (InsertOne/UpdateOne/DeleteOne/...)
 
-        caller builds the ops from pymongo, e.g.:
+        caller builds the ops, e.g.:
             from pymongo import UpdateOne
             ops = [UpdateOne({'_id': i}, {'$set': {...}}, upsert=True) for i in ids]
         returns a summary dict of counts, or an empty dict on failure
@@ -500,8 +571,7 @@ class Mongo:
     async def document_check_multi(
         self, collection: str, target: dict, checks: List[str], value: str
     ) -> bool:
-        """
-        return whether a doc matching target has value in any of the given arrays
+        """return whether a doc matching target has value in any of the given arrays
 
         target is a normal filter dict (merged into the query), not a bare _id
         """
@@ -516,25 +586,27 @@ class Mongo:
             return False
 
 
+# back-compat alias: the class was historically `Mongo`; existing `Mongo(...)` call
+# sites keep working unchanged
+Mongo = MongoDB
+
+
 # -----------------------------------------------------------------------------
-#   backwards-compat module proxy
-#       - lets legacy call sites keep using `await mongo.get_documents(...)`
-#         without an object, after a one-time `mongo.init(conn, db)`
-#       - works with `import mongo; mongo.func(...)` (resolved at call time)
-#       - does NOT work with `from mongo import func` (resolved at import,
-#         before init runs) — switch those sites to `import mongo`
+#   backwards-compat module proxy: `import mongo; mongo.init(conn, db)` then
+#   bare `await mongo.func(...)`. needs `import mongo` — `from mongo import func`
+#   resolves at import time, before init() runs.
 
-_default: Optional[Mongo] = None
+_default: Optional[MongoDB] = None
 
 
-def init(connection_string: str, database: str) -> Mongo:
+def init(connection_string: str, database: str) -> MongoDB:
     """arm the module-level default instance and return it"""
     global _default
-    _default = Mongo(connection_string, database)
+    _default = MongoDB(connection_string, database)
     return _default
 
 
-def instance() -> Mongo:
+def instance() -> MongoDB:
     """return the default instance, raising if init() has not run"""
     if _default is None:
         raise RuntimeError("mongo not initialized; call mongo.init(conn, db) first")