[hma] Switch to pytx copy of HMA interfaces (#1965)

Author: Dcallies

hasher-matcher-actioner/src/OpenMediaMatch/app.py

@@ -25,7 +25,8 @@
 
 from threatexchange.exchanges import auth
 
-from OpenMediaMatch.storage import interface
+from threatexchange.storage.interfaces import SignalExchangeAPIConfig
+from OpenMediaMatch.storage.interface import IFlaskUnifiedStore
 from OpenMediaMatch.storage.postgres.impl import DefaultOMMStore
 from OpenMediaMatch.background_tasks import (
     build_index,
@@ -171,7 +172,7 @@ def create_app() -> OpenAPI:
         app.config["STORAGE_IFACE_INSTANCE"] = DefaultOMMStore()
     storage = app.config["STORAGE_IFACE_INSTANCE"]
     assert isinstance(
-        storage, interface.IUnifiedStore
+        storage, IFlaskUnifiedStore
     ), "STORAGE_IFACE_INSTANCE is not an instance of IUnifiedStore"
 
     _setup_task_logging(app.logger)
@@ -335,7 +336,7 @@ def build_indices():
     )
     @click.option("--unset", is_flag=True, help="clear credentials")
     def set_credentials(
-        api_name: interface.SignalExchangeAPIConfig, from_str: str | None, unset: bool
+        api_name: SignalExchangeAPIConfig, from_str: str | None, unset: bool
     ) -> None:
         """
         Persist credentials for apis.

hasher-matcher-actioner/src/OpenMediaMatch/background_tasks/build_index.py

@@ -8,7 +8,7 @@
 
 from OpenMediaMatch.background_tasks.development import get_apscheduler
 from OpenMediaMatch.persistence import get_storage
-from OpenMediaMatch.storage.interface import (
+from threatexchange.storage.interfaces import (
     ISignalTypeIndexStore,
     ISignalTypeConfigStore,
     IBankStore,

hasher-matcher-actioner/src/OpenMediaMatch/background_tasks/fetcher.py

@@ -15,7 +15,7 @@
 
 from OpenMediaMatch.background_tasks.development import get_apscheduler
 from OpenMediaMatch.persistence import get_storage
-from OpenMediaMatch.storage.interface import ISignalExchangeStore
+from threatexchange.storage.interfaces import ISignalExchangeStore
 from threatexchange.storage.interfaces import SignalTypeConfig
 from OpenMediaMatch.utils.time_utils import duration_to_human_str
 

hasher-matcher-actioner/src/OpenMediaMatch/blueprints/curation.py

@@ -22,7 +22,11 @@
 from OpenMediaMatch import persistence
 from OpenMediaMatch.utils import flask_utils
 from OpenMediaMatch.utils.exchange_schema import exchange_api_schema
-import OpenMediaMatch.storage.interface as iface
+from threatexchange.storage.interfaces import (
+    BankConfig as StoreBankConfig,
+    SignalTypeIndexBuildCheckpoint,
+)
+from OpenMediaMatch.storage.interface import BankContentConfig
 from OpenMediaMatch.blueprints import hashing
 from OpenMediaMatch.schemas.curation import (
     BankConfig,
@@ -108,8 +112,8 @@ def bank_create(body: BankCreateRequest):
     return jsonify(bank_create_impl(body.name, enabled_ratio)), 201
 
 
-def bank_create_impl(name: str, enabled_ratio: float = 1.0) -> iface.BankConfig:
-    bank = iface.BankConfig(name=name, matching_enabled_ratio=enabled_ratio)
+def bank_create_impl(name: str, enabled_ratio: float = 1.0) -> StoreBankConfig:
+    bank = StoreBankConfig(name=name, matching_enabled_ratio=enabled_ratio)
     try:
         persistence.get_storage().bank_update(bank, create=True)
     except ValueError as e:
@@ -356,7 +360,7 @@ def bank_add_content(path: BankPathParams):
 
 
 def _bank_add_signals(
-    bank: iface.BankConfig,
+    bank: StoreBankConfig,
     signal_type_to_signal_str: dict[str, str],
     metadata: t.Optional[BankedContentMetadata],
     note: t.Optional[str] = None,
@@ -383,9 +387,9 @@ def _bank_add_signals(
         if not user_metadata:
             user_metadata = None
 
-    content_config = iface.BankContentConfig(
+    content_config = BankContentConfig(
         id=0,
-        disable_until_ts=iface.BankContentConfig.ENABLED,
+        disable_until_ts=BankContentConfig.ENABLED,
         collab_metadata={},
         original_media_uri=None,
         bank=bank,
@@ -855,9 +859,9 @@ def signal_type_index_status() -> dict[str, dict[str, t.Any]]:
             config.signal_type,
         )
         if tar is None:
-            tar = iface.SignalTypeIndexBuildCheckpoint.get_empty()
+            tar = SignalTypeIndexBuildCheckpoint.get_empty()
         if last is None:
-            last = iface.SignalTypeIndexBuildCheckpoint.get_empty()
+            last = SignalTypeIndexBuildCheckpoint.get_empty()
         ret[name] = {
             "db_size": tar.total_hash_count,
             "index_size": last.total_hash_count,

hasher-matcher-actioner/src/OpenMediaMatch/blueprints/matching.py

@@ -29,7 +29,11 @@
 )
 
 from OpenMediaMatch.background_tasks.development import get_apscheduler
-from OpenMediaMatch.storage import interface
+from threatexchange.storage.interfaces import (
+    SignalTypeIndexBuildCheckpoint,
+    ISignalTypeConfigStore,
+)
+from OpenMediaMatch.storage.interface import IFlaskUnifiedStore
 from OpenMediaMatch.blueprints import hashing
 from OpenMediaMatch.utils.flask_utils import (
     api_error_handler,
@@ -68,7 +72,7 @@ class MatchWithDistancePayload(t.TypedDict):
 class _SignalIndexInMemoryCache:
     signal_type: t.Type[SignalType]
     index: SignalTypeIndex[int]
-    checkpoint: interface.SignalTypeIndexBuildCheckpoint
+    checkpoint: SignalTypeIndexBuildCheckpoint
     last_check_ts: float
     sec_old_before_stale: int
 
@@ -93,12 +97,12 @@ def get_initial(
         return cls(
             signal_type,
             signal_type.get_index_cls().build([]),
-            interface.SignalTypeIndexBuildCheckpoint.get_empty(),
+            SignalTypeIndexBuildCheckpoint.get_empty(),
             0,
             sec_old_before_stale,
         )
 
-    def reload_if_needed(self, store: interface.IUnifiedStore) -> None:
+    def reload_if_needed(self, store: IFlaskUnifiedStore) -> None:
         now = time.time()
         # There's a race condition here, but it's unclear if we should solve it
         curr_checkpoint = store.get_last_index_build_checkpoint(self.signal_type)
@@ -255,7 +259,7 @@ def _checkpoint_timestamp_to_str(checkpoint: int) -> str:
 
 
 def _validate_and_transform_signal_type(
-    signal_type_name: str, storage: interface.ISignalTypeConfigStore
+    signal_type_name: str, storage: ISignalTypeConfigStore
 ) -> type[SignalType]:
     """
     Accepts a signal type name and returns the corresponding signal type class,

hasher-matcher-actioner/src/OpenMediaMatch/persistence.py

@@ -18,13 +18,13 @@
 
 from flask import current_app
 
-from OpenMediaMatch.storage.interface import IUnifiedStore
+from OpenMediaMatch.storage.interface import IFlaskUnifiedStore
 
 
-def get_storage() -> IUnifiedStore:
+def get_storage() -> IFlaskUnifiedStore:
     """
     Get the storage interface for the current app flask instance
 
     Holdover from earlier development, maybe remove someday.
     """
-    return t.cast(IUnifiedStore, current_app.config["STORAGE_IFACE_INSTANCE"])
+    return t.cast(IFlaskUnifiedStore, current_app.config["STORAGE_IFACE_INSTANCE"])