Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove dev:query_media function as it's no longer used #1649

Merged
merged 2 commits into from
Oct 3, 2024
Merged

remove dev:query_media function as it's no longer used #1649

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f779d4
add missing str_to_bool import to development.py
prenner Oct 3, 2024
0156dea
remove query_media function
prenner Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 1 addition & 59 deletions hasher-matcher-actioner/src/OpenMediaMatch/blueprints/development.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,18 @@
Development only routes for easily testing functionality end-to-end, all running on a single host.
"""

import itertools
from flask import Blueprint, abort, request
from flask import Blueprint
from flask import redirect, url_for
from werkzeug.exceptions import HTTPException

from OpenMediaMatch.blueprints.hashing import hash_media
from OpenMediaMatch.blueprints.matching import (
lookup_signal,
lookup_signal_with_distance,
)
from OpenMediaMatch.utils.flask_utils import api_error_handler

from OpenMediaMatch.utils import dev_utils
from OpenMediaMatch import persistence
from OpenMediaMatch.storage.postgres.flask_utils import reset_tables


from threatexchange.exchanges.fetch_state import CollaborationConfigBase
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unused

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't use the whole query_media function I don't see it being used anywhere.

from threatexchange.exchanges.impl.static_sample import StaticSampleSignalExchangeAPI
from threatexchange.exchanges.impl.fb_threatexchange_api import (
FBThreatExchangeSignalExchangeAPI,
FBThreatExchangeCollabConfig,
)

Expand All @@ -33,55 +24,6 @@
bp.register_error_handler(HTTPException, api_error_handler)


@bp.route("/query")
def query_media():
"""
Hash the input media and then match against all banked content.
This is simply a wrapper around the hasing and matching APIs.

Input:
* url - path to the media to hash. Supports image or video.
* signal_type - Signal type (hash type)

Output:
* List of matching content items
"""
signal_type_to_signal_map = hash_media()
if not isinstance(signal_type_to_signal_map, dict):
# We really should not get here, since if something went wrong, it should
if isinstance(signal_type_to_signal_map, tuple):
return signal_type_to_signal_map
abort(500, "Something went wrong while hashing the provided media.")

include_distance = str_to_bool(request.args.get("include_distance", "false"))
lookup_signal_func = (
lookup_signal_with_distance if include_distance else lookup_signal
)

# Check if signal_type is an option in the map of hashes
signal_type_name = request.args.get("signal_type")
if signal_type_name is not None:
if signal_type_name not in signal_type_to_signal_map:
abort(
400,
f"Requested signal type '{signal_type_name}' is not supported for the provided "
"media.",
)
return lookup_signal_func(
signal_type_to_signal_map[signal_type_name], signal_type_name
)
return {
"matches": list(
itertools.chain(
*map(
lambda x: lookup_signal_func(x[1], x[0])["matches"],
signal_type_to_signal_map.items(),
),
)
)
}


@bp.route("/setup_sample_example", methods=["POST"])
def seed_sample():
dev_utils.seed_sample()
Expand Down
Loading