Skip to content

Add range arg option to get_object calls #2161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 30, 2025
Merged

Add range arg option to get_object calls #2161

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2751f6f
Add Range attribute to get_object calls
clayandgen Jun 23, 2025
23da1b2
Update py code to default to string
clayandgen Jun 23, 2025
d0dcc7c
Add Range attribute to spec
clayandgen Jun 24, 2025
50b8864
Add Range attribute to spec
clayandgen Jun 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions openc3/lib/openc3/utilities/aws_bucket.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ def delete(bucket)
end
end

def get_object(bucket:, key:, path: nil)
def get_object(bucket:, key:, path: nil, range: nil)
if path
@client.get_object(bucket: bucket, key: key, response_target: path)
@client.get_object(bucket: bucket, key: key, response_target: path, range: range)
else
@client.get_object(bucket: bucket, key: key)
@client.get_object(bucket: bucket, key: key, range: range)
end
# If the key is not found return nil
rescue Aws::S3::Errors::NoSuchKey
Expand Down
2 changes: 1 addition & 1 deletion openc3/lib/openc3/utilities/bucket.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def delete(bucket)
raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
end

def get_object(bucket:, key:, path: nil)
def get_object(bucket:, key:, path: nil, range: nil)
raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
end

Expand Down
6 changes: 3 additions & 3 deletions openc3/python/openc3/utilities/aws_bucket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,15 @@ def delete(self, bucket):
if self.exist(bucket):
self.client.delete_bucket(Bucket=bucket)

def get_object(self, bucket, key, path=None):
def get_object(self, bucket, key, path=None, range=""):
Copy link
Member

Choose a reason for hiding this comment

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

Should range = "" or None?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Passing Range=None to python Boto3 causes an error, so defaulting to a string here

try:
if path:
response = self.client.get_object(Bucket=bucket, Key=key)
response = self.client.get_object(Bucket=bucket, Key=key, Range=range)
with open(path, "wb") as f:
f.write(response["Body"].read())
return response
else:
return self.client.get_object(Bucket=bucket, Key=key)
return self.client.get_object(Bucket=bucket, Key=key, Range=range)
# If the key is not found return nil
except ClientError:
return None
Expand Down
2 changes: 1 addition & 1 deletion openc3/python/openc3/utilities/bucket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def delete(self, bucket):
f"{self.__class__.__name__} has not implemented method '{inspect.currentframe().f_code.co_name}'"
)

def get_object(self, bucket, key, path=None):
def get_object(self, bucket, key, path=None, range=""):
raise NotImplementedError(
f"{self.__class__.__name__} has not implemented method '{inspect.currentframe().f_code.co_name}'"
)
Expand Down
Loading