Skip to content

Commit

Permalink
Fix formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
prrao87 committed Sep 25, 2023
1 parent e14ee8e commit fa1fa72
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 37 deletions.
5 changes: 2 additions & 3 deletions dbs/elasticsearch/api/routers/rest.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
from elasticsearch import AsyncElasticsearch
from fastapi import APIRouter, HTTPException, Query, Request

from api.schemas.rest import (
CountByCountry,
FullTextSearch,
TopWinesByCountry,
TopWinesByProvince,
)
from elasticsearch import AsyncElasticsearch
from fastapi import APIRouter, HTTPException, Query, Request

router = APIRouter()

Expand Down
3 changes: 1 addition & 2 deletions dbs/lancedb/api/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@

import lancedb
from fastapi import FastAPI
from sentence_transformers import SentenceTransformer

from api.config import Settings
from api.routers.rest import router

from sentence_transformers import SentenceTransformer

model_type = "sbert"


Expand Down
1 change: 1 addition & 0 deletions dbs/lancedb/api/schemas/rest.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from typing import Optional

from pydantic import BaseModel, ConfigDict


Expand Down
18 changes: 1 addition & 17 deletions dbs/lancedb/scripts/bulk_index_sbert.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import sys
from concurrent.futures import ProcessPoolExecutor, as_completed
from functools import lru_cache
from math import e
from pathlib import Path
from typing import Any, Iterator

Expand All @@ -16,10 +15,9 @@
from tqdm import tqdm

sys.path.insert(1, os.path.realpath(Path(__file__).resolve().parents[1]))
from sentence_transformers import SentenceTransformer

from api.config import Settings
from schemas.wine import LanceModelWine, Wine
from sentence_transformers import SentenceTransformer

load_dotenv()
# Custom types
Expand Down Expand Up @@ -120,18 +118,6 @@ def main(data: list[JsonBlob]) -> None:
tbl.create_index(metric="cosine", num_partitions=32, num_sub_vectors=96)


def query_func() -> None:
DB_NAME = "../lancedb"
TABLE = "wines"
db = lancedb.connect(DB_NAME)
tbl = db.open_table(TABLE)
print(len(tbl))
MODEL = SentenceTransformer(get_settings().embedding_model_checkpoint)
query = "tropical fruit and citrus"
query_vector = embed_func([query], MODEL)[0]
print(tbl.search(query_vector).limit(5).to_df()[["id", "title", "description", "_distance"]])


if __name__ == "__main__":
# fmt: off
parser = argparse.ArgumentParser("Bulk index database from the wine reviews JSONL data")
Expand All @@ -153,5 +139,3 @@ def query_func() -> None:
data = data[:LIMIT] if LIMIT > 0 else data
main(data)
print("Finished execution!")

query_func()
5 changes: 2 additions & 3 deletions dbs/meilisearch/api/routers/rest.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
from fastapi import APIRouter, HTTPException, Query, Request
from meilisearch_python_async import Client

from api.schemas.rest import (
FullTextSearch,
TopWinesByCountry,
TopWinesByProvince,
)
from fastapi import APIRouter, HTTPException, Query, Request
from meilisearch_python_async import Client

router = APIRouter()

Expand Down
5 changes: 2 additions & 3 deletions dbs/neo4j/api/routers/rest.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
from fastapi import APIRouter, HTTPException, Query, Request
from neo4j import AsyncManagedTransaction

from api.schemas.rest import (
FullTextSearch,
MostWinesByVariety,
TopWinesByCountry,
TopWinesByProvince,
)
from fastapi import APIRouter, HTTPException, Query, Request
from neo4j import AsyncManagedTransaction

router = APIRouter()

Expand Down
1 change: 0 additions & 1 deletion dbs/neo4j/scripts/build_graph.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

sys.path.insert(1, os.path.realpath(Path(__file__).resolve().parents[1]))
from api.config import Settings

from schemas.wine import Wine

# Custom types
Expand Down
3 changes: 1 addition & 2 deletions dbs/qdrant/api/routers/rest.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
from api.schemas.rest import CountByCountry, SimilaritySearch
from fastapi import APIRouter, HTTPException, Query, Request
from qdrant_client.http import models

from api.schemas.rest import CountByCountry, SimilaritySearch

router = APIRouter()


Expand Down
3 changes: 1 addition & 2 deletions dbs/qdrant/scripts/bulk_index_sbert.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@
from qdrant_client.http import models

sys.path.insert(1, os.path.realpath(Path(__file__).resolve().parents[1]))
from sentence_transformers import SentenceTransformer

from api.config import Settings
from schemas.wine import Wine
from sentence_transformers import SentenceTransformer

load_dotenv()
# Custom types
Expand Down
3 changes: 1 addition & 2 deletions dbs/weaviate/api/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@

import weaviate
from fastapi import FastAPI
from sentence_transformers import SentenceTransformer

from api.config import Settings
from api.routers import rest

from sentence_transformers import SentenceTransformer

model_type = "sbert"


Expand Down
3 changes: 1 addition & 2 deletions dbs/weaviate/api/routers/rest.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from fastapi import APIRouter, HTTPException, Query, Request

from api.schemas.rest import CountByCountry, SimilaritySearch
from fastapi import APIRouter, HTTPException, Query, Request

router = APIRouter()

Expand Down

0 comments on commit fa1fa72

Please sign in to comment.