2022-05-07 20:08:51 +05:30
|
|
|
# frozen_string_literal: true
|
|
|
|
module Gitlab
|
|
|
|
module Diff
|
|
|
|
module Rendered
|
|
|
|
module Notebook
|
|
|
|
include Gitlab::Utils::StrongMemoize
|
|
|
|
|
|
|
|
class DiffFile < Gitlab::Diff::File
|
2022-06-21 17:19:12 +05:30
|
|
|
RENDERED_TIMEOUT_BACKGROUND = 10.seconds
|
|
|
|
RENDERED_TIMEOUT_FOREGROUND = 1.5.seconds
|
|
|
|
BACKGROUND_EXECUTION = 'background'
|
|
|
|
FOREGROUND_EXECUTION = 'foreground'
|
|
|
|
LOG_IPYNBDIFF_GENERATED = 'IPYNB_DIFF_GENERATED'
|
|
|
|
LOG_IPYNBDIFF_TIMEOUT = 'IPYNB_DIFF_TIMEOUT'
|
|
|
|
LOG_IPYNBDIFF_INVALID = 'IPYNB_DIFF_INVALID'
|
2022-07-16 23:28:13 +05:30
|
|
|
LOG_IPYNBDIFF_TRUNCATED = 'IPYNB_DIFF_TRUNCATED'
|
2022-06-21 17:19:12 +05:30
|
|
|
|
2022-05-07 20:08:51 +05:30
|
|
|
attr_reader :source_diff
|
|
|
|
|
|
|
|
delegate :repository, :diff_refs, :fallback_diff_refs, :unfolded, :unique_identifier,
|
|
|
|
to: :source_diff
|
|
|
|
|
|
|
|
def initialize(diff_file)
|
|
|
|
@source_diff = diff_file
|
|
|
|
end
|
|
|
|
|
|
|
|
def old_blob
|
|
|
|
return unless notebook_diff
|
|
|
|
|
|
|
|
strong_memoize(:old_blob) { ::Blobs::Notebook.decorate(source_diff.old_blob, notebook_diff.from.as_text) }
|
|
|
|
end
|
|
|
|
|
|
|
|
def new_blob
|
|
|
|
return unless notebook_diff
|
|
|
|
|
|
|
|
strong_memoize(:new_blob) { ::Blobs::Notebook.decorate(source_diff.new_blob, notebook_diff.to.as_text) }
|
|
|
|
end
|
|
|
|
|
|
|
|
def diff
|
|
|
|
strong_memoize(:diff) { transformed_diff }
|
|
|
|
end
|
|
|
|
|
|
|
|
def has_renderable?
|
|
|
|
!notebook_diff.nil? && diff.diff.present?
|
|
|
|
end
|
|
|
|
|
|
|
|
def rendered
|
|
|
|
self
|
|
|
|
end
|
|
|
|
|
|
|
|
def highlighted_diff_lines
|
|
|
|
@highlighted_diff_lines ||= begin
|
|
|
|
removal_line_maps, addition_line_maps = compute_end_start_map
|
|
|
|
Gitlab::Diff::Highlight.new(self, repository: self.repository).highlight.map do |line|
|
|
|
|
mutate_line(line, addition_line_maps, removal_line_maps)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
private
|
|
|
|
|
|
|
|
def notebook_diff
|
|
|
|
strong_memoize(:notebook_diff) do
|
2022-07-16 23:28:13 +05:30
|
|
|
if source_diff.old_blob&.truncated? || source_diff.new_blob&.truncated?
|
|
|
|
log_event(LOG_IPYNBDIFF_TRUNCATED)
|
|
|
|
next
|
|
|
|
end
|
|
|
|
|
2022-06-21 17:19:12 +05:30
|
|
|
Timeout.timeout(timeout_time) do
|
|
|
|
IpynbDiff.diff(source_diff.old_blob&.data, source_diff.new_blob&.data,
|
2022-07-16 23:28:13 +05:30
|
|
|
raise_if_invalid_nb: true,
|
|
|
|
hide_images: true,
|
|
|
|
diffy_opts: { include_diff_info: true })&.tap do
|
2022-06-21 17:19:12 +05:30
|
|
|
log_event(LOG_IPYNBDIFF_GENERATED)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
rescue Timeout::Error => e
|
|
|
|
rendered_timeout.increment(source: Gitlab::Runtime.sidekiq? ? BACKGROUND_EXECUTION : FOREGROUND_EXECUTION)
|
|
|
|
log_event(LOG_IPYNBDIFF_TIMEOUT, e)
|
2022-05-07 20:08:51 +05:30
|
|
|
rescue IpynbDiff::InvalidNotebookError, IpynbDiff::InvalidTokenError => e
|
2022-06-21 17:19:12 +05:30
|
|
|
log_event(LOG_IPYNBDIFF_INVALID, e)
|
2022-05-07 20:08:51 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def transformed_diff
|
|
|
|
return unless notebook_diff
|
|
|
|
|
|
|
|
diff = source_diff.diff.clone
|
|
|
|
diff.diff = strip_diff_frontmatter(notebook_diff.to_s(:text))
|
|
|
|
diff
|
|
|
|
end
|
|
|
|
|
|
|
|
def strip_diff_frontmatter(diff_content)
|
|
|
|
diff_content.scan(/.*\n/)[2..]&.join('') if diff_content.present?
|
|
|
|
end
|
|
|
|
|
|
|
|
def transformed_line_to_source(transformed_line, transformed_blocks)
|
|
|
|
transformed_blocks.empty? ? 0 : ( transformed_blocks[transformed_line - 1][:source_line] || -1 ) + 1
|
|
|
|
end
|
|
|
|
|
|
|
|
def mutate_line(line, addition_line_maps, removal_line_maps)
|
|
|
|
line.new_pos = transformed_line_to_source(line.new_pos, notebook_diff.to.blocks)
|
|
|
|
line.old_pos = transformed_line_to_source(line.old_pos, notebook_diff.from.blocks)
|
|
|
|
|
|
|
|
line.old_pos = addition_line_maps[line.new_pos] if line.old_pos == 0 && line.new_pos != 0
|
|
|
|
line.new_pos = removal_line_maps[line.old_pos] if line.new_pos == 0 && line.old_pos != 0
|
|
|
|
|
|
|
|
# Lines that do not appear on the original diff should not be commentable
|
2022-06-21 17:19:12 +05:30
|
|
|
line.type = "#{line.type || 'unchanged'}-nomappinginraw" unless addition_line_maps[line.new_pos] || removal_line_maps[line.old_pos]
|
2022-05-07 20:08:51 +05:30
|
|
|
|
|
|
|
line.line_code = line_code(line)
|
|
|
|
line
|
|
|
|
end
|
|
|
|
|
|
|
|
def compute_end_start_map
|
|
|
|
# line_codes are used for assigning notes to diffs, and these depend on the line on the new version and the
|
|
|
|
# line that would have been that one in the previous version. However, since we do a transformation on the
|
|
|
|
# file, that map gets lost. To overcome this, we look at the original source lines and build two maps:
|
|
|
|
# - For additions, we look at the latest line change for that line and pick the old line for that id
|
|
|
|
# - For removals, we look at the first line in the old version, and pick the first line on the new version
|
|
|
|
#
|
|
|
|
#
|
|
|
|
# The caveat here is that we can't have notes on lines that are not a translation of a line in the source
|
|
|
|
# diff
|
|
|
|
#
|
|
|
|
# (gitlab/diff/file.rb:75)
|
|
|
|
|
|
|
|
removals = {}
|
|
|
|
additions = {}
|
|
|
|
|
|
|
|
source_diff.highlighted_diff_lines.each do |line|
|
2022-06-21 17:19:12 +05:30
|
|
|
removals[line.old_pos] = line.new_pos unless source_diff.new_file?
|
|
|
|
additions[line.new_pos] = line.old_pos unless source_diff.deleted_file?
|
2022-05-07 20:08:51 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
[removals, additions]
|
|
|
|
end
|
2022-06-21 17:19:12 +05:30
|
|
|
|
|
|
|
def rendered_timeout
|
|
|
|
@rendered_timeout ||= Gitlab::Metrics.counter(
|
|
|
|
:ipynb_semantic_diff_timeouts_total,
|
|
|
|
'Counts the times notebook diff rendering timed out'
|
|
|
|
)
|
|
|
|
end
|
|
|
|
|
|
|
|
def timeout_time
|
|
|
|
Gitlab::Runtime.sidekiq? ? RENDERED_TIMEOUT_BACKGROUND : RENDERED_TIMEOUT_FOREGROUND
|
|
|
|
end
|
|
|
|
|
|
|
|
def log_event(message, error = nil)
|
|
|
|
Gitlab::AppLogger.info({ message: message })
|
2022-07-16 23:28:13 +05:30
|
|
|
Gitlab::ErrorTracking.log_exception(error) if error
|
2022-06-21 17:19:12 +05:30
|
|
|
nil
|
|
|
|
end
|
2022-05-07 20:08:51 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|