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

aditya/merge-2.15-to-mainline #1131

Closed
wants to merge 2 commits into from
Closed

aditya/merge-2.15-to-mainline #1131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a8f41c
Merge branch 'releases/2.15' into mainline
adityabharadwaj198 Feb 28, 2025
c2f1104
Merge remote-tracking branch 'origin/mainline' into mainline
adityabharadwaj198 Feb 28, 2025
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
10 changes: 5 additions & 5 deletions tests/integ_tests/tensor_search/integ_tests/test_hybrid_search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
import json
import os
import unittest
from unittest import mock

import httpx
import numpy as np
from fastapi.responses import ORJSONResponse
from integ_tests.marqo_test import MarqoTestCase, TestImageUrls

import marqo.core.exceptions as core_exceptions
import marqo.vespa.exceptions as vespa_exceptions
Expand All @@ -15,10 +11,14 @@
from marqo.core.models.marqo_index import *
from marqo.core.models.marqo_index_request import FieldRequest
from marqo.tensor_search import tensor_search
from marqo.tensor_search.enums import SearchMethod
from marqo.tensor_search.models.api_models import CustomVectorQuery
from marqo.tensor_search.models.api_models import ScoreModifierLists
from marqo.tensor_search.models.search import SearchContext
from tests.marqo_test import MarqoTestCase, TestImageUrls
from fastapi.responses import JSONResponse, ORJSONResponse
from marqo.tensor_search.enums import SearchMethod
import httpx
import json
import pytest


Expand Down
2 changes: 1 addition & 1 deletion tests/integ_tests/tensor_search/integ_tests/test_search_combined.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import pytest
import torch
from fastapi.responses import ORJSONResponse
from integ_tests.marqo_test import MarqoTestCase, TestImageUrls

import marqo.api.exceptions as api_exceptions
import marqo.core.exceptions as core_exceptions
Expand All @@ -21,6 +20,7 @@
from marqo.tensor_search import tensor_search
from marqo.tensor_search.enums import SearchMethod
from marqo.tensor_search.models.api_models import SearchQuery, CustomVectorQuery
from tests.marqo_test import MarqoTestCase, TestImageUrls


class TestSearch(MarqoTestCase):
Expand Down
Loading