Merge pull request #195 from SAP/patch/141

upgrade docker

credentialdigger/client.py

@@ -145,8 +145,8 @@ def add_embedding(self, query, discovery_id, repo_url, embedding=None):
         cursor = self.db.cursor()
         try:
             cursor.execute(query, (discovery_id,
-                                   embedding,
                                    snippet,
+                                   embedding,
                                    repo_url))
             self.db.commit()
         except self.Error:

credentialdigger/client_postgres.py

@@ -208,7 +208,7 @@ def add_embedding(self, discovery_id, repo_url, embedding=None):
         embedding: list
             The embedding being added
         """
-        query = 'INSERT INTO embeddings (id, embedding, snippet, repo_url) \
+        query = 'INSERT INTO embeddings (id, snippet, embedding, repo_url) \
                 VALUES (%s, %s, %s, %s);'
         super().add_embedding(query,
                               discovery_id,
@@ -223,7 +223,7 @@ def add_embeddings(self, repo_url):
         repo_url: str
             The discoveries' repository url
         """
-        query = 'INSERT INTO embeddings (id, embedding, snippet, repo_url) \
+        query = 'INSERT INTO embeddings (id, snippet, embedding, repo_url) \
                 VALUES (%s, %s, %s, %s);'
         super().add_embeddings(query, repo_url)
 
@@ -466,9 +466,9 @@ def get_embedding(self, discovery_id=None, snippet=None):
             snippet or id
         """
         if discovery_id:
-            query = 'SELECT embedding FROM embeddings WHERE id=%s'
+            query = 'SELECT embedding FROM embeddings WHERE id=%s;'
         elif snippet:
-            query = 'SELECT embedding FROM embeddings WHERE snippet=%s'
+            query = 'SELECT embedding FROM embeddings WHERE snippet=%s;'
         else:
             return None
         return super().get_embedding(query=query,

credentialdigger/client_sqlite.py

@@ -202,7 +202,7 @@ def add_embedding(self, discovery_id, repo_url, embedding=None):
         repo_url: str
             The discovery's repository url
         """
-        query = 'INSERT INTO embeddings (id, embedding, snippet, repo_url) \
+        query = 'INSERT INTO embeddings (id, snippet, embedding, repo_url) \
                 VALUES (?, ?, ?, ?);'
         return super().add_embedding(query,
                                      discovery_id,

docker-compose.postgres.yml

@@ -21,6 +21,7 @@ services:
         - path_model=$path_model
         - snippet_model=$snippet_model
     container_name: credential_digger_backend
+    image: credential-digger_pg
     restart: always
     env_file:
       - ./.env

docker-compose.yml

@@ -10,8 +10,9 @@ services:
         - SSL_certificate=$SSL_certificate
         - SSL_private_key=$SSL_private_key
     container_name: credential_digger_sqlite
+    image: credential-digger_sqlite
     restart: always
     env_file:
       - ./.env
     ports:
-      - "5000:5000"
+      - "5000:5000"

requirements.txt

@@ -16,7 +16,7 @@ rich
 scikit-learn
 srsly>=2.4.0
 tensorflow==2.5.1; python_version >= "3.8"
-tensorflow==2.4.2; python_version < "3.8"
+tensorflow==2.4.*; python_version < "3.8"
 tensorflow-text==2.5.0; python_version >= "3.8"
-tensorflow-text==2.4.2; python_version < "3.8"
-tf-models-official
+tensorflow-text==2.4.*; python_version < "3.8"
+tf-models-official

sql/create_table.sql

@@ -31,8 +31,8 @@ CREATE TABLE discoveries (
 
 CREATE TABLE embeddings (
   id INTEGER REFERENCES discoveries,
-  embedding TEXT,
   snippet TEXT,
+  embedding TEXT,
   repo_url TEXT REFERENCES repos,
   PRIMARY KEY (id)
 );

ui/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.7
+FROM python:3.9-bullseye
 
 RUN pip install flask_jwt_extended Flask python-dotenv
 RUN apt-get update && apt-get install -y libhyperscan5 libpq-dev gunicorn3