openstudio-analysis 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 910d9bf7e03884f0d18b769fbcf5bb348438fffa4de56590540679f5b193c848
-  data.tar.gz: 702c4692f6ce7c4297965d6b60854657341e92f3efcf5b8ebbe312ae8cb73646
+  metadata.gz: b2b3fab59aeec813435361079d2ce2453b30c3a21d4c3d13addfede64fc944bb
+  data.tar.gz: 20c2f50da2c0f0e34076ad11680e584fd35f79bb688d5224b4fa5783173df77e
 SHA512:
-  metadata.gz: ac4e0cd24adb96e06a35fc463b5588ac2f40c28e6b39e652c74351b63def71549e5f4a7859060d2f403c31c54a2d3275046f1353cc0f3d256d44aa9d5ec5f62e
-  data.tar.gz: 7bdeefad3522338a73d725d10bc853b7e7a114657a3bd237a061e77eecb299b1b59d09fbbbe92eff76f507fd07bbde4bd7e6701f070ee6dd8ea2115d5ccb3d5a
+  metadata.gz: 3d34d8ea49de5a7f248643209d6c8d1942996dfedc91a57801faf2f664d0a04b06930d58f2bfbc3d2034a22f5bb637f06a759e0dd67524dd060c7c8d95fb93ba
+  data.tar.gz: 9a334296581594e233cca22f651da024be123696dab49d592d2a38bc29857585bed08ce1f8afa8c3bfc5f517632d5918bb0b9c5f02e70970473c5f525748bb5f

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 OpenStudio(R) Analysis Gem Change Log
 ==================================
 
+Version 1.3.5
+-------------
+* Increase Timeouts and write_timeouts to deal with latencies for network related issues
+
 Version 1.3.4
 -------------
 * Update licenses

data/lib/openstudio/analysis/server_api.rb

@@ -31,6 +31,9 @@ module OpenStudio
         # create connection with basic capabilities
         @conn = Faraday.new(url: @hostname) do |faraday|
           faraday.request :url_encoded # form-encode POST params
+          faraday.options.timeout = 300
+          faraday.options.open_timeout = 300
+          faraday.options.write_timeout = 1800
           faraday.use Faraday::Response::Logger, @logger
           # faraday.response @logger # log requests to STDOUT
           faraday.adapter Faraday.default_adapter # make requests with Net::HTTP
@@ -40,6 +43,9 @@ module OpenStudio
         @conn_multipart = Faraday.new(url: @hostname) do |faraday|
           faraday.request :multipart
           faraday.request :url_encoded # form-encode POST params
+          faraday.options.timeout = 300
+          faraday.options.open_timeout = 300
+          faraday.options.write_timeout = 1800
           faraday.use Faraday::Response::Logger, @logger
           # faraday.response :logger # log requests to STDOUT
           faraday.adapter Faraday.default_adapter # make requests with Net::HTTP
@@ -97,13 +103,17 @@ module OpenStudio
 
         # TODO: make this a display name and a machine name
         project_hash = { project: { name: (options[:project_name]).to_s } }
-
-        response = @conn.post do |req|
-          req.url '/projects.json'
-          req.headers['Content-Type'] = 'application/json'
-          req.body = project_hash.to_json
+        begin
+          response = @conn.post do |req|
+            req.url '/projects.json'
+            req.headers['Content-Type'] = 'application/json'
+            req.body = project_hash.to_json
+          end
+          puts "response.status: #{response.status}"
+          puts response.inspect
+        rescue Net::OpenTimeout => e
+          puts "new_project OpenTimeout: #{e.message}"
         end
-
         if response.status == 201
           project_id = JSON.parse(response.body)['_id']
 
@@ -204,16 +214,19 @@ module OpenStudio
         begin
           resp = @conn.get do |req|
             req.url 'status.json'
-            req.options.timeout = 120
-            req.options.open_timeout = 120
+            req.options.timeout = 300
+            req.options.open_timeout = 300
           end
-
+          puts "machine_status resp.status: #{resp.status}"
+          puts resp.inspect
           if resp.status == 200
             j = JSON.parse resp.body, symbolize_names: true
             status = j if j
           end
-        rescue Faraday::ConnectionFailed
-        rescue Net::ReadTimeout
+        rescue Faraday::ConnectionFailed => e
+          puts "machine_Status ConnectionFailed: #{e.message}"
+        rescue Net::ReadTimeout => e
+          puts "machine_Status ReadTimeout: #{e.message}"
         end
 
         status
@@ -466,7 +479,8 @@ module OpenStudio
           req.url "projects/#{project_id}/analyses.json"
           req.headers['Content-Type'] = 'application/json'
           req.body = formulation_json.to_json
-          req.options[:timeout] = 600 # seconds
+          req.options.timeout = 600 # seconds
+          req.options.write_timeout = 1800
         end
 
         if response.status == 201
@@ -486,7 +500,8 @@ module OpenStudio
 
           payload = { file: Faraday::UploadIO.new(options[:upload_file], 'application/zip') }
           response = @conn_multipart.post "analyses/#{analysis_id}/upload.json", payload do |req|
-            req.options[:timeout] = 1800 # seconds
+            req.options.timeout = 1800 # seconds
+            req.options.write_timeout = 1800
           end
 
           if response.status == 201
@@ -632,7 +647,8 @@ module OpenStudio
           req.url "analyses/#{analysis_id}/action.json"
           req.headers['Content-Type'] = 'application/json'
           req.body = options.to_json
-          req.options[:timeout] = 1800 # seconds
+          req.options.timeout = 1800 # seconds
+          req.options.write_timeout = 1800
         end
 
         if response.status == 200

data/lib/openstudio/analysis/version.rb

@@ -7,6 +7,6 @@ module OpenStudio
   module Analysis
     # format should be ^.*\-{1}[a-z]+[0-9]+
     # for example: -rc1, -beta6, -customusecase0
-    VERSION = '1.3.4'.freeze
+    VERSION = '1.3.5'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-analysis
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Nicholas Long
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-14 00:00:00.000000000 Z
+date: 2023-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcl
@@ -202,7 +202,7 @@ homepage: http://openstudio.nrel.gov
 licenses:
 - BSD
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Create JSON, ZIP to communicate with OpenStudio Distributed Analysis in the
   Cloud