cornflow 1.1.5__py3-none-any.whl → 1.2.0__py3-none-any.whl

cornflow/models/base_data_model.py

@@ -1,14 +1,13 @@
 """
 
 """
-# Import from libraries
+
 from flask import current_app
 from sqlalchemy import desc
 from sqlalchemy.dialects.postgresql import JSON
 from sqlalchemy.dialects.postgresql import TEXT
 from sqlalchemy.ext.declarative import declared_attr
 
-# Import from internal modules
 from cornflow.models.meta_models import TraceAttributesModel
 from cornflow.shared import db
 from cornflow.shared.utils import hash_json_256
@@ -39,7 +38,7 @@ class BaseDataModel(TraceAttributesModel):
 
     def __init__(self, data):
         self.user_id = data.get("user_id")
-        self.data = data.get("data") or data.get("execution_results")
+        self.data = data.get("data")
         self.data_hash = hash_json_256(self.data)
         self.name = data.get("name")
         self.description = data.get("description")
@@ -50,23 +49,16 @@ class BaseDataModel(TraceAttributesModel):
     @classmethod
     def get_all_objects(
         cls,
-        user,
         schema=None,
         creation_date_gte=None,
         creation_date_lte=None,
         deletion_date_gte=None,
         deletion_date_lte=None,
-        id=None,
         update_date_gte=None,
         update_date_lte=None,
-        user_name=None,
-        last_name=None,
-        email=None,
-        role_id=None,
-        url_rule=None,
-        description=None,
         offset=0,
         limit=10,
+        user=None,
     ):
         """
         Query to get all objects from a user
@@ -77,13 +69,6 @@ class BaseDataModel(TraceAttributesModel):
         :param string creation_date_lte: created_at needs to be smaller or equal to this
         :param string deletion_date_gte: deletion_at needs to be larger or equal to this
         :param string deletion_date_lte: deletion_at needs to be smaller or equal to this
-        :param string id: user id
-        :param string user_name: user first name
-        :param string last_name: user last name
-        :param string email: user email
-        :param int role_id: user role id
-        :param string url_rule: url_rule
-        :param string description: description
         :param string update_date_gte: update_at needs to be larger or equal to this
         :param string update_date_lte: update_at needs to be smaller or equal to this
         :param int offset: query offset for pagination
@@ -114,20 +99,7 @@ class BaseDataModel(TraceAttributesModel):
         if update_date_gte:
             query = query.filter(cls.update_at >= update_date_gte)
         if update_date_lte:
-            query = query.filter(cls.updat_at <= update_date_lte)
-        if user_name:
-            query = query.filter(cls.user_name == user_name)
-        if last_name:
-            query = query.filter(cls.last_name == last_name)
-        if email:
-            query = query.filter(cls.email == email)
-        if role_id:
-            query = query.filter(cls.role_id == role_id)
-        if url_rule:
-            query = query.filter(cls.url_rule == url_rule)
-        if description:
-            query = query.filter(cls.description == description)
-        # if airflow they also return total_entries = query.count(), for some reason
+            query = query.filter(cls.update_at <= update_date_lte)
 
         return query.order_by(desc(cls.created_at)).offset(offset).limit(limit).all()
 

cornflow/models/meta_models.py

@@ -1,13 +1,13 @@
 """
 This file contains the base abstract models from which the rest of the models inherit
 """
-# Imports from libraries
-from datetime import datetime
+
+from datetime import datetime, timezone
+from typing import Dict, List
+
 from flask import current_app
 from sqlalchemy.exc import DBAPIError, IntegrityError
-from typing import Dict, List
 
-# Imports from internal modules
 from cornflow.shared import db
 from cornflow.shared.exceptions import InvalidData
 
@@ -33,7 +33,9 @@ class EmptyBaseModel(db.Model):
 
         try:
             db.session.commit()
-            current_app.logger.debug(f"Transaction type: {action}, performed correctly on {self}")
+            current_app.logger.debug(
+                f"Transaction type: {action}, performed correctly on {self}"
+            )
         except IntegrityError as err:
             db.session.rollback()
             current_app.logger.error(f"Integrity error on {action} data: {err}")
@@ -99,7 +101,10 @@ class EmptyBaseModel(db.Model):
         action = "bulk create"
         try:
             db.session.commit()
-            current_app.logger.debug(f"Transaction type: {action}, performed correctly on {cls}")
+            current_app.logger.debug(
+                f"Transaction type: {action}, performed correctly on {cls}"
+            )
+
         except IntegrityError as err:
             db.session.rollback()
             current_app.logger.error(f"Integrity error on {action} data: {err}")
@@ -120,7 +125,10 @@ class EmptyBaseModel(db.Model):
         action = "bulk create update"
         try:
             db.session.commit()
-            current_app.logger.debug(f"Transaction type: {action}, performed correctly on {cls}")
+            current_app.logger.debug(
+                f"Transaction type: {action}, performed correctly on {cls}"
+            )
+
         except IntegrityError as err:
             db.session.rollback()
             current_app.logger.error(f"Integrity error on {action} data: {err}")
@@ -136,12 +144,7 @@ class EmptyBaseModel(db.Model):
         return instances
 
     @classmethod
-    def get_all_objects(
-        cls,
-        offset=0,
-        limit=None,
-        **kwargs
-    ):
+    def get_all_objects(cls, offset=0, limit=None, **kwargs):
         """
         Method to get all the objects from the database applying the filters passed as keyword arguments
 
@@ -154,7 +157,9 @@ class EmptyBaseModel(db.Model):
         """
         if "user" in kwargs:
             kwargs.pop("user")
-        query = cls.query.filter_by(**kwargs).offset(offset)
+        query = cls.query.filter_by(**kwargs)
+        if offset:
+            query = query.offset(offset)
         if limit:
             query = query.limit(limit)
         return query
@@ -208,8 +213,8 @@ class TraceAttributesModel(EmptyBaseModel):
     deleted_at = db.Column(db.DateTime, nullable=True)
 
     def __init__(self):
-        self.created_at = datetime.utcnow()
-        self.updated_at = datetime.utcnow()
+        self.created_at = datetime.now(timezone.utc)
+        self.updated_at = datetime.now(timezone.utc)
         self.deleted_at = None
 
     def update(self, data):
@@ -220,11 +225,11 @@ class TraceAttributesModel(EmptyBaseModel):
         :return: None
         :rtype: None
         """
-        self.updated_at = datetime.utcnow()
+        self.updated_at = datetime.now(timezone.utc)
         super().update(data)
 
     def pre_update(self, data):
-        self.updated_at = datetime.utcnow()
+        self.updated_at = datetime.now(timezone.utc)
         super().pre_update(data)
 
     def disable(self):
@@ -234,7 +239,7 @@ class TraceAttributesModel(EmptyBaseModel):
         :return: None
         :rtype: None
         """
-        self.deleted_at = datetime.utcnow()
+        self.deleted_at = datetime.now(timezone.utc)
         db.session.add(self)
         self.commit_changes("disabling")
 
@@ -245,7 +250,7 @@ class TraceAttributesModel(EmptyBaseModel):
         :return: None
         :rtype: None
         """
-        self.updated_at = datetime.utcnow()
+        self.updated_at = datetime.now(timezone.utc)
         self.deleted_at = None
         db.session.add(self)
         self.commit_changes("activating")
@@ -261,7 +266,7 @@ class TraceAttributesModel(EmptyBaseModel):
         update_date_lte=None,
         offset=0,
         limit=None,
-        **kwargs
+        **kwargs,
     ):
         """
         Method to get all the objects from the database applying the filters passed as keyword arguments
@@ -300,7 +305,8 @@ class TraceAttributesModel(EmptyBaseModel):
         if creation_date_lte:
             query = query.filter(cls.created_at <= creation_date_lte)
 
-        query = query.offset(offset)
+        if offset:
+            query = query.offset(offset)
         if limit:
             query = query.limit(limit)
         return query

cornflow/models/user.py

@@ -1,10 +1,11 @@
 """
 This file contains the UserModel
 """
+
 # Imports from external libraries
 import random
 import string
-from datetime import datetime
+from datetime import datetime, timezone, timedelta
 
 # Imports from internal modules
 from cornflow.models.meta_models import TraceAttributesModel
@@ -55,9 +56,7 @@ class UserModel(TraceAttributesModel):
     pwd_last_change = db.Column(db.DateTime, nullable=True)
     email = db.Column(db.String(128), nullable=False, unique=True)
 
-    user_roles = db.relationship(
-        "UserRoleModel", cascade="all,delete", backref="users"
-    )
+    user_roles = db.relationship("UserRoleModel", cascade="all,delete", backref="users")
 
     instances = db.relationship(
         "InstanceModel",
@@ -95,15 +94,14 @@ class UserModel(TraceAttributesModel):
         self.first_name = data.get("first_name")
         self.last_name = data.get("last_name")
         self.username = data.get("username")
-        self.pwd_last_change = datetime.utcnow()
+        self.pwd_last_change = datetime.now(timezone.utc)
         # TODO: handle better None passwords that can be found when using ldap
         check_pass, msg = check_password_pattern(data.get("password"))
         if check_pass:
             self.password = self.__generate_hash(data.get("password"))
         else:
             raise InvalidCredentials(
-                msg,
-                log_txt="Error while trying to create a new user. " + msg
+                msg, log_txt="Error while trying to create a new user. " + msg
             )
 
         check_email, msg = check_email_pattern(data.get("email"))
@@ -111,8 +109,7 @@ class UserModel(TraceAttributesModel):
             self.email = data.get("email")
         else:
             raise InvalidCredentials(
-                msg,
-                log_txt="Error while trying to create a new user. " + msg
+                msg, log_txt="Error while trying to create a new user. " + msg
             )
 
     def update(self, data):
@@ -126,7 +123,7 @@ class UserModel(TraceAttributesModel):
         if new_password:
             new_password = self.__generate_hash(new_password)
             data["password"] = new_password
-            data["pwd_last_change"] = datetime.utcnow()
+            data["pwd_last_change"] = datetime.now(timezone.utc)
         super().update(data)
 
     def comes_from_external_provider(self):

cornflow/schemas/alarms.py

@@ -1,6 +1,7 @@
 """
 This file contains the schemas used for the table alarms defined in the application None
 """
+
 from marshmallow import fields, Schema
 
 
@@ -18,3 +19,10 @@ class AlarmsResponse(AlarmsPostRequest):
 class QueryFiltersAlarms(Schema):
     schema = fields.Str(required=False)
     criticality = fields.Number(required=False)
+
+
+class AlarmEditRequest(Schema):
+    name = fields.Str(required=False)
+    criticality = fields.Number(required=False)
+    description = fields.Str(required=False)
+    schema = fields.Str(required=False)

cornflow/schemas/query.py

@@ -1,13 +1,14 @@
 """
 This file contains the schemas used to query the results of a GET request
 """
+
 from marshmallow import fields, Schema
 
 
 class BaseQueryFilters(Schema):
     """This is the schema of the base query arguments"""
 
-    limit = fields.Int(required=False, dump_default=20)
+    limit = fields.Int(required=False, dump_default=10)
     offset = fields.Int(required=False, dump_default=0)
     creation_date_gte = fields.DateTime(required=False)
     creation_date_lte = fields.DateTime(required=False)

cornflow/schemas/user.py

@@ -27,7 +27,7 @@ class UserEndpointResponse(Schema):
     last_name = fields.Str()
     email = fields.Str()
     created_at = fields.Str()
-    pwd_last_change = fields.Str()
+    pwd_last_change = fields.DateTime()
 
 
 class UserDetailsEndpointResponse(Schema):
@@ -36,7 +36,7 @@ class UserDetailsEndpointResponse(Schema):
     last_name = fields.Str()
     username = fields.Str()
     email = fields.Str()
-    pwd_last_change = fields.Str()
+    pwd_last_change = fields.DateTime()
 
 
 class TokenEndpointResponse(Schema):
@@ -53,7 +53,6 @@ class UserEditRequest(Schema):
     last_name = fields.Str(required=False)
     email = fields.Str(required=False)
     password = fields.Str(required=False)
-    pwd_last_change = fields.DateTime(required=False)
 
 
 class LoginEndpointRequest(Schema):
@@ -67,24 +66,10 @@ class LoginEndpointRequest(Schema):
 
 class LoginOpenAuthRequest(Schema):
     """
-    This is the schema used by the login endpoint with Open ID protocol
-    Validates that either a token is provided, or both username and password are present
+    Schema for the login request with OpenID authentication
     """
-
-    token = fields.Str(required=False)
-    username = fields.Str(required=False)
-    password = fields.Str(required=False)
-
-    @validates_schema
-    def validate_fields(self, data, **kwargs):
-        if data.get("token") is None:
-            if not data.get("username") or not data.get("password"):
-                raise ValidationError(
-                    "A token needs to be provided when using Open ID authentication"
-                )
-        else:
-            if data.get("username") or data.get("password"):
-                raise ValidationError("The login needs to be done with a token only")
+    username = fields.String(required=False)
+    password = fields.String(required=False)
 
 
 class SignupRequest(Schema):