fix: Solve json encoder Neo4j datetime

Author: GermanMT

app/apis/managers/pip_service.py

@@ -63,18 +63,6 @@ async def requires_pip_packages(pkg_name: str, version_dist: str) -> dict[str, l
             data = data[0].replace('(', '').replace(')', '').replace(' ', '').replace("'", '')
             pos = await get_first_position(data, ['<', '>', '=', '!', '~'])
             dist = data[:pos]
-            ctcs = await parse_pip_constraints(data[pos:])
-            if (
-                dist in require_packages and
-                isinstance(require_packages[dist], dict) and
-                isinstance(ctcs, list)
-            ):
-                for ctc in ctcs:
-                    if ctc not in require_packages[dist]:
-                        require_packages[dist].append(ctcs)
-            else:
-                if '.' not in ctcs and ctcs != '':
-                    continue
-                require_packages[dist] = ctcs
+            require_packages[dist] = await parse_pip_constraints(data[pos:])
         return require_packages
     return {}

app/main.py

@@ -1,4 +1,3 @@
-from time import sleep
 from fastapi import FastAPI, Request
 from fastapi.exceptions import RequestValidationError
 from fastapi.exception_handlers import (
@@ -9,19 +8,22 @@
 from starlette.exceptions import HTTPException
 from starlette.responses import Response
 from apscheduler.schedulers.background import BackgroundScheduler
+from time import sleep
 from app.controllers import nvd_updater
 from app.router import api_router
 from app.services import create_indexes
 
+
 DESCRIPTION = '''
 A backend for dependency graph building, atribution of vulnerabilities and reasoning
 over it.
 '''
 
+
 app = FastAPI(
     title='Depex',
     description=DESCRIPTION,
-    version='0.5.0',
+    version='0.6.0',
     contact={
         'name': 'Antonio Germán Márquez Trujillo',
         'url': 'https://github.com/GermanMT',
@@ -41,7 +43,9 @@ async def startup_event() -> None:
             await create_indexes()
             await nvd_updater()
             scheduler = BackgroundScheduler()
-            scheduler.add_job(nvd_updater, 'interval', seconds=216000)
+            scheduler.add_job(nvd_updater, 'interval', seconds=7200)
+            # TODO: Create a job for updating exploit database
+            # scheduler.add_job(exploit_db_updater, 'interval', seconds=86400)
             scheduler.start()
             break
         except:
@@ -57,6 +61,7 @@ async def custom_http_exception_handler(request: Request, exc: HTTPException) ->
 async def validation_exception_handler(request: Request, exc: RequestValidationError) -> Response:
     return await request_validation_exception_handler(request, exc)
 
+
 app.add_middleware(
     CORSMiddleware,
     allow_origins=[],
@@ -65,4 +70,5 @@ async def validation_exception_handler(request: Request, exc: RequestValidationE
     allow_headers=['*']
 )
 
+
 app.include_router(api_router)

app/utils/json_encoder.py

@@ -1,6 +1,7 @@
 from json import JSONEncoder, loads
 from typing import Any
 from datetime import datetime
+from neo4j.time import DateTime
 from bson import ObjectId
 
 
@@ -10,6 +11,8 @@ def default(self, o: Any) -> Any:
             return str(o)
         if isinstance(o, datetime):
             return str(o)
+        if isinstance(o, DateTime):
+            return str(o)
         return JSONEncoder.default(self, o)
 
 

app/utils/metrics.py

@@ -6,5 +6,5 @@ async def mean(impacts: list[float]) -> float:
 
 async def weighted_mean(impacts: list[float]) -> float:
     if impacts:
-        return sum([var**2 * 0.1 for var in impacts]) / sum([var * 0.1 for var in impacts])
+        return sum(var**2 * 0.1 for var in impacts) / sum(var * 0.1 for var in impacts)
     return 0.

app/utils/parse_pip_constraints.py

@@ -10,16 +10,18 @@ async def parse_pip_constraints(raw_constraints: str) -> str:
             else:
                 ctcs.append(ctc.strip())
         if ctcs:
-            return await clean_pip_constraints(ctcs)
+            clean_ctcs = await clean_pip_constraints(ctcs)
+            if clean_ctcs:
+                return clean_ctcs
     return 'any'
 
 
 async def clean_pip_constraints(raw_constraints: list[str]) -> str:
     constraints = []
     for raw_constraint in raw_constraints:
-        if  ' ' not in raw_constraint:
-            continue
         if ' ' not in raw_constraint:
+            if raw_constraint.isalpha():
+                continue
             for index, char in enumerate(raw_constraint):
                 if char.isdigit():
                     raw_constraint = raw_constraint[:index] + ' ' + raw_constraint[index:]
@@ -30,7 +32,7 @@ async def clean_pip_constraints(raw_constraints: list[str]) -> str:
             version = version[:pos - 1]
             constraints.append('>= ' + version)
             constraints.append('< ' + version[:pos - 2] + str(int(version[pos - 2]) + 1))
-        elif '=' in operator and all([symbol not in operator for symbol in ['<', '>', '~', '!']]):
+        elif '=' in operator and all(symbol not in operator for symbol in ('<', '>', '~', '!')):
             constraints.append('== ' + version)
         elif '!=' in operator and '*' in version:
             pos = version.find('*')