Commit a3271dd4 authored by Eduardo Bonet's avatar Eduardo Bonet

Adding log messages for ipynbdiff

parent 1631b270
...@@ -121,6 +121,19 @@ class BlobPresenter < Gitlab::View::Presenter::Delegated ...@@ -121,6 +121,19 @@ class BlobPresenter < Gitlab::View::Presenter::Delegated
end end
def transformed_blob_data def transformed_blob_data
@transformed_blob ||= ( blob.path.ends_with?('.ipynb') && IpynbDiff.transform(blob.data, options: { include_metadata: false, cell_decorator: :percent }) ) || blob.data @transformed_blob ||= if blob.path.ends_with?('.ipynb')
begin
new_blob = IpynbDiff.transform(blob.data,
raise_errors: true,
options: { include_metadata: false, cell_decorator: :percent })
rescue IpynbDiff::InvalidNotebookError => e
Gitlab::ErrorTracking.track_and_raise_for_dev_exception(e, issue_url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/344676')
return blob.data
end
return Gitlab::AppLogger.info('IPYNBDIFF_BLOB_NIL') && blob.data unless new_blob
Gitlab::AppLogger.info('IPYNBDIFF_BLOB_GENERATED') && new_blob
end
end end
end end
...@@ -456,11 +456,21 @@ module Gitlab ...@@ -456,11 +456,21 @@ module Gitlab
from = old_blob_lazy&.data from = old_blob_lazy&.data
to = new_blob_lazy&.data to = new_blob_lazy&.data
new_diff = IpynbDiff.diff(from, to, begin
diff_opts: { context: 5, include_diff_info: true }, new_diff = IpynbDiff.diff(from, to,
transform_options: { cell_decorator: :percent } ) diff_opts: { context: 5, include_diff_info: true },
transform_options: { cell_decorator: :percent },
diff.diff = new_diff.scan(/.*\n/)[2..-1].join('') if new_diff raise_if_invalid_notebook: true)
if new_diff
diff.diff = new_diff.scan(/.*\n/)[2..-1].join('')
Gitlab::AppLogger.info("IPYNB_DIFF_GENERATED")
else
Gitlab::AppLogger.info("IPYNB_DIFF_NIL")
end
rescue IpynbDiff::InvalidNotebookError => e
Gitlab::ErrorTracking.track_and_raise_for_dev_exception(e, issue_url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/344676')
end
end end
def alternate_viewer_class def alternate_viewer_class
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment