Skip to content

Ingestors#1809

Merged
mlodic merged 25 commits intodevelopfrom
ingestor_v2
Aug 7, 2023
Merged

Ingestors#1809
mlodic merged 25 commits intodevelopfrom
ingestor_v2

Conversation

@0ssigeno
Copy link
Contributor

No description provided.

Signed-off-by: 0ssigeno <[email protected]>
@0ssigeno 0ssigeno marked this pull request as draft July 31, 2023 14:50
@0ssigeno
Copy link
Contributor Author

TODO: docs

Copy link
Contributor

@code-review-doctor code-review-doctor bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Worth considering though. View full project report here.

@0ssigeno
Copy link
Contributor Author

TODO celery beat scheduler

0ssigeno added 2 commits July 31, 2023 17:57
Signed-off-by: 0ssigeno <[email protected]>
Signed-off-by: 0ssigeno <[email protected]>
@codecov
Copy link

codecov bot commented Aug 1, 2023

Codecov Report

Merging #1809 (f1c81ce) into develop (aa8820f) will increase coverage by 9.45%.
Report is 1265 commits behind head on develop.
The diff coverage is 76.29%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #1809      +/-   ##
===========================================
+ Coverage    66.75%   76.21%   +9.45%     
===========================================
  Files           95      378     +283     
  Lines         3706    12380    +8674     
  Branches       519     1303     +784     
===========================================
+ Hits          2474     9435    +6961     
- Misses         941     2407    +1466     
- Partials       291      538     +247     
Files Changed Coverage Δ
...analyzers_manager/migrations/0004_datamigration.py 91.30% <ø> (ø)
api_app/decorators.py 78.94% <ø> (ø)
api_app/defaults.py 100.00% <ø> (ø)
api_app/documents.py 100.00% <ø> (ø)
api_app/fields.py 57.14% <ø> (ø)
api_app/filters.py 72.97% <ø> (ø)
api_app/forms.py 37.50% <ø> (ø)
api_app/helpers.py 65.90% <ø> (+5.90%) ⬆️
api_app/ingestors_manager/admin.py 100.00% <ø> (ø)
api_app/ingestors_manager/apps.py 100.00% <ø> (ø)
... and 231 more

... and 190 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update bc45f82...f1c81ce. Read the comment docs.

Signed-off-by: 0ssigeno <[email protected]>
Signed-off-by: 0ssigeno <[email protected]>
Signed-off-by: 0ssigeno <[email protected]>
Signed-off-by: 0ssigeno <[email protected]>
Signed-off-by: 0ssigeno <[email protected]>
Signed-off-by: 0ssigeno <[email protected]>
Signed-off-by: 0ssigeno <[email protected]>
Signed-off-by: 0ssigeno <[email protected]>
@0ssigeno 0ssigeno marked this pull request as ready for review August 4, 2023 08:38
@0ssigeno 0ssigeno requested a review from mlodic August 4, 2023 08:38
Copy link
Contributor

@code-review-doctor code-review-doctor bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Worth considering though. View full project report here.

Signed-off-by: 0ssigeno <[email protected]>
Signed-off-by: 0ssigeno <[email protected]>
Signed-off-by: 0ssigeno <[email protected]>
Signed-off-by: 0ssigeno <[email protected]>
Signed-off-by: 0ssigeno <[email protected]>
Signed-off-by: 0ssigeno <[email protected]>
Copy link
Member

@mlodic mlodic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I report you this error too from the Admin section after clicking on "Crontab".

http://localhost/admin/django_celery_beat/crontabschedule/


Template error:
In template /usr/local/lib/python3.9/site-packages/django/contrib/admin/templates/admin/change_list.html, error at line 68
   
   58 :         {% block search %}{% search_form cl %}{% endblock %}
   59 :         {% block date_hierarchy %}{% if cl.date_hierarchy %}{% date_hierarchy cl %}{% endif %}{% endblock %}
   60 : 
   61 :         <form id="changelist-form" method="post"{% if cl.formset and cl.formset.is_multipart %} enctype="multipart/form-data"{% endif %} novalidate>{% csrf_token %}
   62 :         {% if cl.formset %}
   63 :           <div>{{ cl.formset.management_form }}</div>
   64 :         {% endif %}
   65 : 
   66 :         {% block result_list %}
   67 :           {% if action_form and actions_on_top and cl.show_admin_actions %}{% admin_actions %}{% endif %}
   68 :            {% result_list cl %} 
   69 :           {% if action_form and actions_on_bottom and cl.show_admin_actions %}{% admin_actions %}{% endif %}
   70 :         {% endblock %}
   71 :         {% block pagination %}{% pagination cl %}{% endblock %}
   72 :         </form>
   73 :       </div>
   74 :       {% block filters %}
   75 :         {% if cl.has_filters %}
   76 :           <div id="changelist-filter">
   77 :             <h2>{% translate 'Filter' %}</h2>
   78 :             {% if cl.has_active_filters %}<h3 id="changelist-filter-clear">


Traceback (most recent call last):
  File "/usr/local/lib/python3.9/site-packages/django/db/models/options.py", line 669, in get_field
    return self.fields_map[field_name]

During handling of the above exception ('human_readable'), another exception occurred:
  File "/usr/local/lib/python3.9/site-packages/django/contrib/admin/utils.py", line 271, in lookup_field
    f = _get_non_gfk_field(opts, name)
  File "/usr/local/lib/python3.9/site-packages/django/contrib/admin/utils.py", line 302, in _get_non_gfk_field
    field = opts.get_field(name)
  File "/usr/local/lib/python3.9/site-packages/django/db/models/options.py", line 671, in get_field
    raise FieldDoesNotExist(

During handling of the above exception (CrontabSchedule has no field named 'human_readable'), another exception occurred:
  File "/usr/local/lib/python3.9/site-packages/cron_descriptor/ExpressionDescriptor.py", line 120, in get_full_description
    day_of_week_desc = self.get_day_of_week_description()
  File "/usr/local/lib/python3.9/site-packages/cron_descriptor/ExpressionDescriptor.py", line 330, in get_day_of_week_description
    return self.get_segment_description(
  File "/usr/local/lib/python3.9/site-packages/cron_descriptor/ExpressionDescriptor.py", line 503, in get_segment_description
    description_content += get_single_item_description(segment)
  File "/usr/local/lib/python3.9/site-packages/cron_descriptor/ExpressionDescriptor.py", line 333, in <lambda>
    lambda s: get_day_name(s),
  File "/usr/local/lib/python3.9/site-packages/cron_descriptor/ExpressionDescriptor.py", line 303, in get_day_name
    return ExpressionDescriptor.number_to_day(int(exp))

During handling of the above exception (invalid literal for int() with base 10: '[2'), another exception occurred:
  File "/usr/local/lib/python3.9/site-packages/django/core/handlers/exception.py", line 56, in inner
    response = get_response(request)
  File "/usr/local/lib/python3.9/site-packages/django/core/handlers/base.py", line 220, in _get_response
    response = response.render()
  File "/usr/local/lib/python3.9/site-packages/django/template/response.py", line 114, in render
    self.content = self.rendered_content
  File "/usr/local/lib/python3.9/site-packages/django/template/response.py", line 92, in rendered_content
    return template.render(context, self._request)
  File "/usr/local/lib/python3.9/site-packages/django/template/backends/django.py", line 61, in render
    return self.template.render(context)
  File "/usr/local/lib/python3.9/site-packages/django/template/base.py", line 175, in render
    return self._render(context)
  File "/usr/local/lib/python3.9/site-packages/django/template/base.py", line 167, in _render
    return self.nodelist.render(context)
  File "/usr/local/lib/python3.9/site-packages/django/template/base.py", line 1005, in render
    return SafeString("".join([node.render_annotated(context) for node in self]))
  File "/usr/local/lib/python3.9/site-packages/django/template/base.py", line 1005, in <listcomp>
    return SafeString("".join([node.render_annotated(context) for node in self]))
  File "/usr/local/lib/python3.9/site-packages/django/template/base.py", line 966, in render_annotated
    return self.render(context)
  File "/usr/local/lib/python3.9/site-packages/django/template/loader_tags.py", line 157, in render
    return compiled_parent._render(context)
  File "/usr/local/lib/python3.9/site-packages/django/template/base.py", line 167, in _render
    return self.nodelist.render(context)
  File "/usr/local/lib/python3.9/site-packages/django/template/base.py", line 1005, in render
    return SafeString("".join([node.render_annotated(context) for node in self]))
  File "/usr/local/lib/python3.9/site-packages/django/template/base.py", line 1005, in <listcomp>
    return SafeString("".join([node.render_annotated(context) for node in self]))
  File "/usr/local/lib/python3.9/site-packages/django/template/base.py", line 966, in render_annotated
    return self.render(context)
  File "/usr/local/lib/python3.9/site-packages/django/template/loader_tags.py", line 157, in render
    return compiled_parent._render(context)
  File "/usr/local/lib/python3.9/site-packages/django/template/base.py", line 167, in _render
    return self.nodelist.render(context)
  File "/usr/local/lib/python3.9/site-packages/django/template/base.py", line 1005, in render
    return SafeString("".join([node.render_annotated(context) for node in self]))
  File "/usr/local/lib/python3.9/site-packages/django/template/base.py", line 1005, in <listcomp>
    return SafeString("".join([node.render_annotated(context) for node in self]))
  File "/usr/local/lib/python3.9/site-packages/django/template/base.py", line 966, in render_annotated
    return self.render(context)
  File "/usr/local/lib/python3.9/site-packages/django/template/loader_tags.py", line 63, in render
    result = block.nodelist.render(context)
  File "/usr/local/lib/python3.9/site-packages/django/template/base.py", line 1005, in render
    return SafeString("".join([node.render_annotated(context) for node in self]))
  File "/usr/local/lib/python3.9/site-packages/django/template/base.py", line 1005, in <listcomp>
    return SafeString("".join([node.render_annotated(context) for node in self]))
  File "/usr/local/lib/python3.9/site-packages/django/template/base.py", line 966, in render_annotated
    return self.render(context)
  File "/usr/local/lib/python3.9/site-packages/django/template/loader_tags.py", line 63, in render
    result = block.nodelist.render(context)
  File "/usr/local/lib/python3.9/site-packages/django/template/base.py", line 1005, in render
    return SafeString("".join([node.render_annotated(context) for node in self]))
  File "/usr/local/lib/python3.9/site-packages/django/template/base.py", line 1005, in <listcomp>
    return SafeString("".join([node.render_annotated(context) for node in self]))
  File "/usr/local/lib/python3.9/site-packages/django/template/base.py", line 966, in render_annotated
    return self.render(context)
  File "/usr/local/lib/python3.9/site-packages/django/contrib/admin/templatetags/base.py", line 45, in render
    return super().render(context)
  File "/usr/local/lib/python3.9/site-packages/django/template/library.py", line 258, in render
    _dict = self.func(*resolved_args, **resolved_kwargs)
  File "/usr/local/lib/python3.9/site-packages/django/contrib/admin/templatetags/admin_list.py", line 336, in result_list
    "results": list(results(cl)),
  File "/usr/local/lib/python3.9/site-packages/django/contrib/admin/templatetags/admin_list.py", line 312, in results
    yield ResultList(None, items_for_result(cl, res, None))
  File "/usr/local/lib/python3.9/site-packages/django/contrib/admin/templatetags/admin_list.py", line 303, in __init__
    super().__init__(*items)
  File "/usr/local/lib/python3.9/site-packages/django/contrib/admin/templatetags/admin_list.py", line 213, in items_for_result
    f, attr, value = lookup_field(field_name, result, cl.model_admin)
  File "/usr/local/lib/python3.9/site-packages/django/contrib/admin/utils.py", line 282, in lookup_field
    attr = getattr(obj, name)
  File "/usr/local/lib/python3.9/site-packages/django_celery_beat/models.py", line 319, in human_readable
    human_readable = get_description('{} {} {} {} {}'.format(
  File "/usr/local/lib/python3.9/site-packages/cron_descriptor/ExpressionDescriptor.py", line 652, in get_description
    return descripter.get_description(DescriptionTypeEnum.FULL)
  File "/usr/local/lib/python3.9/site-packages/cron_descriptor/ExpressionDescriptor.py", line 104, in get_description
    return choices.get(description_type, self.get_seconds_description)()
  File "/usr/local/lib/python3.9/site-packages/cron_descriptor/ExpressionDescriptor.py", line 136, in get_full_description
    raise FormatException(description)

Exception Type: FormatException at /admin/django_celery_beat/crontabschedule/
Exception Value: 

mlodic and others added 5 commits August 4, 2023 15:55
Signed-off-by: 0ssigeno <[email protected]>
Signed-off-by: 0ssigeno <[email protected]>
Signed-off-by: 0ssigeno <[email protected]>
@0ssigeno 0ssigeno requested a review from mlodic August 7, 2023 07:06
@mlodic mlodic merged commit 0243f9f into develop Aug 7, 2023
@0ssigeno 0ssigeno deleted the ingestor_v2 branch September 6, 2023 15:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Ingestor] Threatfox [requires #1397 completed] New plugin type: Ingestors

2 participants