apply PR feedback

Author: MattShirley

servicex_app/migrations/versions/1.6.2.py

@@ -0,0 +1,27 @@
+"""
+Revision ID: v1_6_2
+Revises: v1_5_7a
+Create Date: 2025-05-13
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+revision = 'v1_6_2'
+down_revision = 'v1_5_7a'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.add_column('transform_result', sa.Column('created_at', sa.DateTime(), nullable=True))
+    op.execute('UPDATE transform_result SET created_at = CURRENT_TIMESTAMP')
+    op.alter_column('transform_result', 'created_at', nullable=False)
+
+    op.create_index('ix_transform_result_created_at', 'transform_result', ['created_at'])
+
+
+def downgrade():
+    op.drop_index('ix_transform_result_created_at', table_name='transform_result')
+
+    op.drop_column('transform_result', 'created_at')

servicex_app/servicex_app/models.py

@@ -356,6 +356,7 @@ class TransformationResult(db.Model):
     total_events = db.Column(db.BigInteger, nullable=True)
     total_bytes = db.Column(db.BigInteger, nullable=True)
     avg_rate = db.Column(db.Float, nullable=True)
+    created_at = db.Column(DateTime, default=func.now())
 
     __table_args__ = (
         db.UniqueConstraint('file_id', 'request_id', name='uix_file_request'),
@@ -376,7 +377,8 @@ def to_json(cls, x):
             'transform_time': x.transform_time,
             'total-events': x.total_events,
             'total-bytes': x.total_bytes,
-            'avg-rate': x.avg_rate
+            'avg-rate': x.avg_rate,
+            'created_at': x.created_at.isoformat() if x.created_at else None,
         }
 
     def save_to_db(self):

servicex_app/servicex_app/resources/internal/get_transformation_results.py

@@ -0,0 +1,43 @@
+import logging
+import datetime
+
+from flask_restful import reqparse
+
+from servicex_app.decorators import auth_required
+from servicex_app.models import TransformationResult
+from servicex_app.resources.servicex_resource import ServiceXResource
+
+logger = logging.getLogger(__name__)
+
+
+class TransformationResults(ServiceXResource):
+    @auth_required
+    def get(self, request_id):
+        if not request_id:
+            return {"message": "Missing required transformation request_id"}, 400
+
+        parser = reqparse.RequestParser()
+        parser.add_argument(
+            'cutoff',
+            type=str,
+            required=False,
+            location='args'
+        )
+
+        args = parser.parse_args()
+
+        transform_result_query = TransformationResult.query.filter_by(request_id=request_id)
+
+        cutoff_str = args.get('cutoff')
+        if cutoff_str:
+            try:
+                cutoff = datetime.datetime.fromisoformat(cutoff_str)
+            except AttributeError as exc:
+                return {"message": f"Cutoff value {cutoff_str} is not an ISO 8601 compliant datetime"}, 400
+            transform_result_query = transform_result_query.filter(TransformationResult.created_at > cutoff)
+
+        results = [transformation_result.to_json(transformation_result) for transformation_result in transform_result_query]
+
+        return {
+            "results": results
+        }

servicex_app/servicex_app/resources/transformation/results.py

@@ -44,14 +44,14 @@ def add_routes(api, transformer_manager, rabbit_mq_adaptor,
     from servicex_app.resources.internal.fileset_complete import FilesetComplete
     from servicex_app.resources.internal.transform_status import TransformationStatusInternal
     from servicex_app.resources.internal.transformer_file_complete import TransformerFileComplete
-    from servicex_app.resources.internal.get_transformation_results import GetTransformationResults
 
     from servicex_app.resources.transformation.submit import SubmitTransformationRequest
     from servicex_app.resources.transformation.status import TransformationStatus
     from servicex_app.resources.transformation.cancel import CancelTransform
     from servicex_app.resources.transformation.get_all import AllTransformationRequests
     from servicex_app.resources.transformation.get_one import TransformationRequest
     from servicex_app.resources.transformation.deployment import DeploymentStatus
+    from servicex_app.resources.transformation.results import TransformationResults
 
     from servicex_app.resources.users.all_users import AllUsers
     from servicex_app.resources.users.token_refresh import TokenRefresh
@@ -140,6 +140,8 @@ def add_routes(api, transformer_manager, rabbit_mq_adaptor,
     api.add_resource(AllTransformationRequests, prefix)
     prefix += "/<string:request_id>"
     api.add_resource(TransformationRequest, prefix)
+    api.add_resource(TransformationResults, prefix + '/results')
+
 
     DeleteTransform.make_api(object_store)
     api.add_resource(DeleteTransform, prefix)
@@ -170,5 +172,3 @@ def add_routes(api, transformer_manager, rabbit_mq_adaptor,
 
     DataLifecycleOps.make_api(object_store)
     api.add_resource(DataLifecycleOps, '/servicex/internal/data-lifecycle')
-
-    api.add_resource(GetTransformationResults, '/servicex/internal/transformation/<string:request_id>/results')