skylab_studio 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dcea80a2765d6d89b736dbdaf420595a284c66b1c2319bdb537e6dce55d6c29
-  data.tar.gz: 26870d180ef19254df91ce67ffeb150564c6a144ccbc8965414c48938f687486
+  metadata.gz: 0be4e813eaaeefc166701f414e7312bb0c49adec754429d7c7c3a25b4ed0cd7d
+  data.tar.gz: 2f2efb2aea31469afa87fce6a8ab26f1f7417ccded50aa21ae1f5bfcde9ae429
 SHA512:
-  metadata.gz: b01781324fb9c33b8720b54d218ed0c60f346069b04ac646e720b641c85316ef140d96821d69f1054c73a997445a0c1cc4adbf56be3c2f3a765e42c7354ea6d4
-  data.tar.gz: e78732d764037a41fad813879db50e04defe51ac4eb2eadd1c437693f5e8e58489c5795d135f0c4e81a3d3a4c2d17b024d2897e6733603ec5d81d8a8f41cfef6
+  metadata.gz: 31a05a41368c85714165aed69ac087c1e9b15299ff0811e68182d37d7b73f0068b6d239d68fb640e98faf4eab19c3713aa23fb345f31abbba2f8226cf5691065
+  data.tar.gz: 1ca009f37032c449ece76ca20400b861c2ecc58941c6adaf31447f6422d0e8ac53b77df3e4b5fec59fcd3893dd03ba3a65416ad1b56aff27854e6c658c45d857

data/lib/skylab_studio/client.rb

@@ -275,9 +275,11 @@ module SkylabStudio
       photo_data = { "#{model}_id": id, name: "#{photo_name}#{photo_ext}", path: photo_path, 'use_cache_upload': false }
 
       if model == 'job'
-        job_type = get_job(id)['type']
+        job = get_job(id)
 
-        headers = { 'X-Amz-Tagging' => 'job=photo&api=true' } if job_type == 'regular'
+        raise "No job found with id: #{id}" unless job.has_key?('type')
+
+        headers = { 'X-Amz-Tagging' => 'job=photo&api=true' } if job['type'] == 'regular'
       end
 
       # Ask studio to create the photo record
@@ -303,36 +305,37 @@ module SkylabStudio
       # PUT request to presigned url with image data
       headers['Content-MD5'] = b64md5
 
-      begin
-        uri = URI(upload_url)
-        request = Net::HTTP::Put.new(uri, headers)
-        request.body = data
-        upload_photo_resp = Net::HTTP.start(uri.hostname) { |http| http.request(request) }
-
-        unless upload_photo_resp
-          puts 'First upload attempt failed, retrying...'
-          retry_count = 0
-          # Retry upload
-
-          while retry_count < 3
-            upload_photo_resp = Net::HTTP.start(uri.hostname) { |http| http.request(request) }
-            if upload_photo_resp
-              break # Upload was successful, exit the loop
-            elsif retry_count == 2 # Check if retry count is 2 (0-based indexing)
-              raise 'Unable to upload to the bucket after retrying.'
-            else
-              sleep(1) # Wait for a moment before retrying
-              retry_count += 1
-            end
+      retries = 0
+      while retries < 3
+        begin
+          uri = URI(upload_url)
+          request = Net::HTTP::Put.new(uri, headers)
+          request.body = data
+
+          upload_photo_resp = Net::HTTP.start(uri.hostname) { |http| http.request(request) }
+          upload_status_code = upload_photo_resp.code.to_i
+
+          if upload_status_code >= 400
+            raise StandardError.new("HTTP Error: #{upload_photo_resp.code}")
+          end
+
+          # If no error, the upload is successful, exit the loop
+          break
+        rescue Exception => e
+          if retries == 2
+            delete_photo(photo_id)
+            Sentry.capture_exception(e)
+            raise e
+          else
+            # If we haven't retried 3 times, wait and retry
+            puts "Attempt ##{retries + 1} to upload failed, retrying..."
+            retries += 1
+            sleep(retries + 1)
           end
         end
-      rescue StandardError => e
-        puts "An exception of type #{e.class} occurred: #{e.message}"
-        puts 'Deleting created, but unuploaded photo...'
-        delete_photo({ id: photo_id }) if photo_id
       end
 
-      photo_response_json
+      { photo: photo_response_json, upload_response: upload_status_code }
     end
 
     def download_image_async(image_url)

data/lib/skylab_studio/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SkylabStudio
-  VERSION = '1.0.8'
+  VERSION = '1.0.9'
 end

data/lib/skylab_studio.rb

@@ -9,7 +9,26 @@ require 'net/https'
 require 'uri'
 require 'json'
 
+# sentry
+require 'stackprof'
+require 'sentry-ruby'
+
 require_relative 'skylab_studio/request'
 require_relative 'skylab_studio/client'
 require_relative 'skylab_studio/config'
 require_relative 'skylab_studio/version' unless defined?(Skylab::VERSION)
+
+Sentry.init do |config|
+  config.dsn = 'https://b2c54fe447391bac2134b1a679050139@o1409269.ingest.us.sentry.io/4507891689717760'
+
+  # get breadcrumbs from logs
+  config.breadcrumbs_logger = [:sentry_logger, :http_logger]
+
+  # enable tracing
+  # we recommend adjusting this value in production
+  config.traces_sample_rate = 1.0
+
+  # enable profiling
+  # this is relative to traces_sample_rate
+  config.profiles_sample_rate = 1.0
+end

data/spec/lib/skylab_studio/client_spec.rb

@@ -135,13 +135,13 @@ RSpec.describe SkylabStudio::Client do
   describe '#upload_job_photo' do
     before do
       stub_request(:post, 'https://studio.skylabtech.ai/api/public/v1/photos')
-        .to_return(status: 200, body: { id: 1, photo: {} }.to_json, headers: {})
+        .to_return(status: 200, body: { id: 1 }.to_json, headers: {})
 
       stub_request(:get, 'https://studio.skylabtech.ai/api/public/v1/photos/upload_url')
         .to_return(status: 200, body: { url: 'http://test.test/' }.to_json, headers: {})
 
       stub_request(:get, 'https://studio.skylabtech.ai/api/public/v1/jobs/1')
-        .to_return(status: 200, body: {}.to_json, headers: {})
+        .to_return(status: 200, body: { type: 'regular' }.to_json, headers: {})
 
       stub_request(:delete, 'https://studio.skylabtech.ai/api/public/v1/photos/1')
         .to_return(status: 200, body: { id: 1 }.to_json, headers: {})
@@ -156,7 +156,7 @@ RSpec.describe SkylabStudio::Client do
       photo_path = "#{File.expand_path('../../', File.dirname(__FILE__))}/test-portrait-1.JPG"
       id = 1
 
-      expected_response = { id: id, photo: {} }.to_json
+      expected_response = { photo: { id: id }, upload_response: 200 }.to_json
 
       expect(subject.upload_job_photo(photo_path, id).to_json).to eq(expected_response)
     end
@@ -165,7 +165,7 @@ RSpec.describe SkylabStudio::Client do
   describe '#upload_profile_photo' do
     before do
       stub_request(:post, 'https://studio.skylabtech.ai/api/public/v1/photos')
-        .to_return(status: 200, body: { id: 1, photo: {} }.to_json, headers: {})
+        .to_return(status: 200, body: { id: 1 }.to_json, headers: {})
 
       stub_request(:get, 'https://studio.skylabtech.ai/api/public/v1/photos/upload_url')
         .to_return(status: 200, body: { url: 'http://test.test/' }.to_json, headers: {})
@@ -187,7 +187,7 @@ RSpec.describe SkylabStudio::Client do
       photo_path = "#{File.expand_path('../../', File.dirname(__FILE__))}/test-portrait-1.JPG"
       id = 1
 
-      expected_response = { id: id, photo: {} }.to_json
+      expected_response = { photo: { id: id }, upload_response: 200 }.to_json
 
       expect(subject.upload_profile_photo(photo_path, 1).to_json).to eq(expected_response)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylab_studio
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Paul Lam
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-08 00:00:00.000000000 Z
+date: 2024-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -60,7 +60,7 @@ homepage: https://github.com/skylab-tech/studio_client_ruby
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -75,13 +75,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: A HTTP client for accessing studio.skylabtech.ai services.
 test_files:
-- spec/spec_helper.rb
-- spec/lib/skylab_studio/request_spec.rb
 - spec/lib/skylab_studio/client_spec.rb
 - spec/lib/skylab_studio/config_spec.rb
+- spec/lib/skylab_studio/request_spec.rb
 - spec/lib/skylab_studio/version_spec.rb
+- spec/spec_helper.rb