Skip to content

Conversation

@evilsocket
Copy link
Contributor

@evilsocket evilsocket commented Nov 15, 2024

Closes ENG-85:

  • Added unit tests for rigging.watchers.write_chats_to_jsonl
  • Implemented rigging.watchers.write_chats_to_s3
  • Added unit tests for rigging.watchers.write_chats_to_s3

NOTE:

In order to use boto3 I had to remove the optional types-requests dependency (used to type-hint examples) because of this conflict:

    Because no versions of boto3 match >1.35.62,<2.0.0
 and boto3 (1.35.62) depends on botocore (>=1.35.62,<1.36.0), boto3 (>=1.35.62,<2.0.0) requires botocore (>=1.35.62,<1.36.0).
(1) So, because no versions of botocore match >1.35.62,<1.36.0
 and botocore (1.35.62) depends on urllib3 (>=1.25.4,<1.27), boto3 (>=1.35.62,<2.0.0) requires urllib3 (>=1.25.4,<1.27).

    Because no versions of types-requests match >2.32.0.20240523,<2.32.0.20240602 || >2.32.0.20240602,<2.32.0.20240622 || >2.32.0.20240622,<2.32.0.20240712 || >2.32.0.20240712,<2.32.0.20240905 || >2.32.0.20240905,<2.32.0.20240907 || >2.32.0.20240907,<2.32.0.20240914 || >2.32.0.20240914,<2.32.0.20241016 || >2.32.0.20241016,<3.0.0.0
 and types-requests (2.32.0.20240523) depends on urllib3 (>=2), types-requests (>=2.32.0.20240523,<2.32.0.20240602 || >2.32.0.20240602,<2.32.0.20240622 || >2.32.0.20240622,<2.32.0.20240712 || >2.32.0.20240712,<2.32.0.20240905 || >2.32.0.20240905,<2.32.0.20240907 || >2.32.0.20240907,<2.32.0.20240914 || >2.32.0.20240914,<2.32.0.20241016 || >2.32.0.20241016,<3.0.0.0) requires urllib3 (>=2).
    And because types-requests (2.32.0.20240602) depends on urllib3 (>=2), types-requests (>=2.32.0.20240523,<2.32.0.20240622 || >2.32.0.20240622,<2.32.0.20240712 || >2.32.0.20240712,<2.32.0.20240905 || >2.32.0.20240905,<2.32.0.20240907 || >2.32.0.20240907,<2.32.0.20240914 || >2.32.0.20240914,<2.32.0.20241016 || >2.32.0.20241016,<3.0.0.0) requires urllib3 (>=2).
    And because types-requests (2.32.0.20240622) depends on urllib3 (>=2)
 and types-requests (2.32.0.20240712) depends on urllib3 (>=2), types-requests (>=2.32.0.20240523,<2.32.0.20240905 || >2.32.0.20240905,<2.32.0.20240907 || >2.32.0.20240907,<2.32.0.20240914 || >2.32.0.20240914,<2.32.0.20241016 || >2.32.0.20241016,<3.0.0.0) requires urllib3 (>=2).
    And because types-requests (2.32.0.20240905) depends on urllib3 (>=2)
 and types-requests (2.32.0.20240907) depends on urllib3 (>=2), types-requests (>=2.32.0.20240523,<2.32.0.20240914 || >2.32.0.20240914,<2.32.0.20241016 || >2.32.0.20241016,<3.0.0.0) requires urllib3 (>=2).
    And because types-requests (2.32.0.20240914) depends on urllib3 (>=2)
 and types-requests (2.32.0.20241016) depends on urllib3 (>=2), types-requests (>=2.32.0.20240523,<3.0.0.0) requires urllib3 (>=2).
    And because boto3 (>=1.35.62,<2.0.0) requires urllib3 (>=1.25.4,<1.27) (1), boto3 (>=1.35.62,<2.0.0) is incompatible with types-requests (>=2.32.0.20240523,<3.0.0.0)
    So, because rigging depends on both boto3 (^1.35.62) and types-requests (^2.32.0.20240523), version solving failed.

This does not create any functional difference or validation failure.

@evilsocket evilsocket requested a review from monoxgas November 15, 2024 14:34
Copy link
Contributor

@monoxgas monoxgas left a comment

Choose a reason for hiding this comment

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

Looks amazing! Let's go.

One note that isn't blocking ATM, but we might want to target dev as the landing branch so we can roll it up in a new release version and push to main.

@evilsocket
Copy link
Contributor Author

evilsocket commented Nov 15, 2024

@monoxgas my bad, changed base to dev

@evilsocket evilsocket changed the base branch from main to dev November 15, 2024 17:12
@evilsocket evilsocket merged commit bbbd24d into dreadnode:dev Nov 15, 2024
@evilsocket evilsocket deleted the feat/eng-85-add-write-to-s3-callback-to-rigging branch November 15, 2024 17:13
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.

2 participants