revert new qdrant

Author: bbedward

database/qdrant/qdrant_client.go

@@ -106,44 +106,6 @@ func (q QdrantClient) RoundTrip(r *http.Request) (*http.Response, error) {
 	return q.r.RoundTrip(r)
 }
 
-func NewQdrantTestClient(ctx context.Context) (*QdrantClient, error) {
-	// Get URLs from env, comma separated
-	if utils.GetEnv().QdrantAltUrl == "" {
-		log.Errorf("QDRANT_URL not set")
-		return nil, errors.New("QDRANT_URL not set")
-	}
-	var auth string
-	if utils.GetEnv().QdrantUsername != "" && utils.GetEnv().QdrantPassword != "" {
-		auth = base64.StdEncoding.EncodeToString([]byte(utils.GetEnv().QdrantUsername + ":" + utils.GetEnv().QdrantPassword))
-	}
-	// Create client
-	qClient := &QdrantClient{
-		ActiveUrl:      utils.GetEnv().QdrantAltUrl,
-		Ctx:            ctx,
-		token:          auth,
-		r:              http.DefaultTransport,
-		CollectionName: utils.GetEnv().QdrantCollectionName,
-	}
-
-	transport := http.DefaultTransport
-	if auth != "" {
-		transport = qClient
-	}
-
-	c, doer, err := NewClientWithResponses(qClient.ActiveUrl, WithHTTPClient(&http.Client{
-		Timeout:   QDRANT_TIMEOUT_S * time.Second,
-		Transport: transport,
-	}))
-	if err != nil {
-		log.Errorf("Error creating qdrant client %v", err)
-		return nil, err
-	}
-	qClient.Client = c
-	qClient.Doer = doer
-
-	return qClient, nil
-}
-
 func NewQdrantClient(ctx context.Context) (*QdrantClient, error) {
 	// Get URLs from env, comma separated
 	if utils.GetEnv().QdrantUrl == "" {

server/api/rest/api.go

@@ -35,7 +35,6 @@ type RestAPI struct {
 	QueueThrottler *shared.UserQueueThrottlerMap
 	S3             *s3.S3
 	Qdrant         *qdrant.QdrantClient
-	QdrantTest     *qdrant.QdrantClient
 	Clip           *clip.ClipService
 	SafetyChecker  *translator.TranslatorSafetyChecker
 	SCWorker       *scworker.SCWorker

server/api/rest/gallery.go

@@ -157,7 +157,7 @@ func (c *RestAPI) HandleSemanticSearchGallery(w http.ResponseWriter, r *http.Req
 		var embeddings []float32
 		if err == nil {
 			// Get embeddings from qdrant
-			getPointRes, err := c.QdrantTest.GetPoint(uid, false)
+			getPointRes, err := c.Qdrant.GetPoint(uid, false)
 			if err != nil {
 				log.Error("Error getting point from qdrant", "err", err)
 				if strings.Contains(err.Error(), "Error querying collection 404") {
@@ -177,7 +177,7 @@ func (c *RestAPI) HandleSemanticSearchGallery(w http.ResponseWriter, r *http.Req
 			}
 		}
 
-		res, err := c.QdrantTest.QueryGenerations(embeddings, perPage, offset, scoreThreshold, filters.Oversampling, qdrantFilters, false, false)
+		res, err := c.Qdrant.QueryGenerations(embeddings, perPage, offset, scoreThreshold, filters.Oversampling, qdrantFilters, false, false)
 		if err != nil {
 			log.Error("Error querying qdrant", "err", err)
 			responses.ErrInternalServerError(w, r, "An unknown error occurred")

server/app.go

@@ -145,24 +145,6 @@ func main() {
 		log.Warn("Error creating qdrant indexes", "err", err)
 	}
 
-	// ! Test - second qdrnat client
-	qdrantNewClient, err := qdrant.NewQdrantTestClient(ctx)
-	if err != nil {
-		log.Fatal("Error connecting to qdrant", "err", err)
-		os.Exit(1)
-	}
-	err = qdrantNewClient.CreateCollectionIfNotExists(false)
-	if err != nil {
-		log.Fatal("Error creating qdrant collection", "err", err)
-		os.Exit(1)
-	}
-
-	// Create indexes in Qdrant
-	err = qdrantNewClient.CreateAllIndexes()
-	if err != nil {
-		log.Warn("Error creating qdrant indexes", "err", err)
-	}
-
 	// Q Throttler
 	qThrottler := shared.NewQueueThrottler(ctx, redis.Client, shared.REQUEST_COG_TIMEOUT)
 
@@ -1120,7 +1102,6 @@ func main() {
 		QueueThrottler: qThrottler,
 		S3:             s3ClientImg,
 		Qdrant:         qdrantClient,
-		QdrantTest:     qdrantNewClient,
 		Clip:           clip.NewClipService(redis, safetyChecker),
 		SMap:           apiTokenSmap,
 		SafetyChecker:  safetyChecker,

utils/env.go

@@ -65,7 +65,6 @@ type SCEnv struct {
 	MockRedis             bool   `env:"MOCK_REDIS" envDefault:"false"`                                 // Whether to mock redis for tests
 	// Qdrant
 	QdrantUrl            string `env:"QDRANT_URL"`                                    // Qdrant URL, required
-	QdrantAltUrl         string `env:"QDRANT_NEW_URL"`                                // Qdrant Alternative URL, optional
 	QdrantUsername       string `env:"QDRANT_USERNAME"`                               // Qdrant Username, Optional
 	QdrantPassword       string `env:"QDRANT_PASSWORD"`                               // Qdrant Password, Optional
 	QdrantCollectionName string `env:"QDRANT_COLLECTION_NAME" envDefault:"stablecog"` // Qdrant Collection Name