tempest_db 0.12.1 → 0.13.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bd0251246d8e34f45d4a9a642a5c0437787969eb
+  data.tar.gz: 82770a53fbac19c30faf7608011199b9b353e4c8
+SHA512:
+  metadata.gz: e6b6e00c7e9165ed2200a9a7edcf08b9b97f0c07f6988f39403c59214ad455b49e452247926e60b737eeb65543e7dd3a9d4fc2fd7f7a268d47cece4988f19bcf
+  data.tar.gz: 8b3887040d8ec3ebe1c5120584e6f31e03ec0bf7c2a27ece714b88160562054a99dea22d83869fa732d46c32807ec39a7c56cf97a3debbe11429326a1d8773c1

data/lib/base_thrift_client.rb

@@ -8,10 +8,11 @@ module Teapot
       @executor = nil
       @transport = nil
 
-      def initialize(server, port)
+      def initialize(server, port, max_retries = 3)
         @server = server
         @port = port
         @executor = init_executor(init_protocol())
+        @max_retries = max_retries
       end
 
       def init_protocol
@@ -32,6 +33,20 @@ module Teapot
         @executor
       end
 
+
+      def with_retries(&f)
+        (0..@max_retries).each do |retry_count|
+          begin
+            return f.call(get_executor)
+          rescue Thrift::TransportException, IOError
+            if retry_count == @max_retries then
+              raise # re-throw exception back to user
+            else
+              puts "For call #{caller[3][/`([^']*)'/, 1]}, attempting to reconnect to #{@server}:#{@port}..."
+              @executor = init_executor(init_protocol())
+            end
+          end
+        end
+      end
     end
 end
-

data/lib/gen/tempest_d_b_service.rb

@@ -86,13 +86,13 @@ module Teapot
           raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'kStepInNeighborsFiltered failed: unknown result')
         end
 
-        def ppr(edgeType, seeds, pageRankParams)
-          send_ppr(edgeType, seeds, pageRankParams)
+        def ppr(edgeType, seeds, seedType, targetType, pageRankParams)
+          send_ppr(edgeType, seeds, seedType, targetType, pageRankParams)
           return recv_ppr()
         end
 
-        def send_ppr(edgeType, seeds, pageRankParams)
-          send_message('ppr', Ppr_args, :edgeType => edgeType, :seeds => seeds, :pageRankParams => pageRankParams)
+        def send_ppr(edgeType, seeds, seedType, targetType, pageRankParams)
+          send_message('ppr', Ppr_args, :edgeType => edgeType, :seeds => seeds, :seedType => seedType, :targetType => targetType, :pageRankParams => pageRankParams)
         end
 
         def recv_ppr()
@@ -189,7 +189,7 @@ module Teapot
           args = read_args(iprot, Ppr_args)
           result = Ppr_result.new()
           begin
-            result.success = @handler.ppr(args.edgeType, args.seeds, args.pageRankParams)
+            result.success = @handler.ppr(args.edgeType, args.seeds, args.seedType, args.targetType, args.pageRankParams)
           rescue ::Teapot::TempestDB::UndefinedGraphException => error1
             result.error1 = error1
           rescue ::InvalidNodeIdException => error2
@@ -399,11 +399,15 @@ module Teapot
         include ::Thrift::Struct, ::Thrift::Struct_Union
         EDGETYPE = 1
         SEEDS = 2
-        PAGERANKPARAMS = 3
+        SEEDTYPE = 3
+        TARGETTYPE = 4
+        PAGERANKPARAMS = 5
 
         FIELDS = {
           EDGETYPE => {:type => ::Thrift::Types::STRING, :name => 'edgeType'},
           SEEDS => {:type => ::Thrift::Types::LIST, :name => 'seeds', :element => {:type => ::Thrift::Types::I64}},
+          SEEDTYPE => {:type => ::Thrift::Types::STRING, :name => 'seedType'},
+          TARGETTYPE => {:type => ::Thrift::Types::STRING, :name => 'targetType'},
           PAGERANKPARAMS => {:type => ::Thrift::Types::STRUCT, :name => 'pageRankParams', :class => ::Teapot::TempestDB::MonteCarloPageRankParams}
         }
 

data/lib/gen/tempest_db_types.rb

@@ -104,7 +104,7 @@ module Teapot
       MAXINTERMEDIATENODEDEGREE = 3
       MINREPORTEDVISITS = 4
       MAXRESULTCOUNT = 5
-      UNDIRECTGRAPH = 6
+      ALTERNATINGWALK = 6
 
       FIELDS = {
         NUMSTEPS => {:type => ::Thrift::Types::I32, :name => 'numSteps'},
@@ -112,7 +112,7 @@ module Teapot
         MAXINTERMEDIATENODEDEGREE => {:type => ::Thrift::Types::I32, :name => 'maxIntermediateNodeDegree', :default => 1000, :optional => true},
         MINREPORTEDVISITS => {:type => ::Thrift::Types::I32, :name => 'minReportedVisits', :optional => true},
         MAXRESULTCOUNT => {:type => ::Thrift::Types::I32, :name => 'maxResultCount', :optional => true},
-        UNDIRECTGRAPH => {:type => ::Thrift::Types::BOOL, :name => 'undirectGraph', :default => false, :optional => true}
+        ALTERNATINGWALK => {:type => ::Thrift::Types::BOOL, :name => 'alternatingWalk', :default => true, :optional => true}
       }
 
       def struct_fields; FIELDS; end

data/lib/tempest_db.rb

@@ -26,10 +26,18 @@ require 'base_thrift_client'
 
 module Teapot
   module TempestDB
-    class TempestClient < Teapot::BaseThriftClient
+    class TempestThriftClient < Teapot::BaseThriftClient
       def init_executor(protocol)
         Teapot::TempestDB::TempestDBService::Client.new(protocol)
       end
+    end
+
+    class TempestClient
+      @thrift_client = nil
+
+      def initialize(server, port)
+        @thrift_client = Teapot::TempestDB::TempestThriftClient.new(server, port)
+      end
 
       def TempestClient.jsonToValue(json_attribute)
         if json_attribute[0] == '"'
@@ -46,28 +54,119 @@ module Teapot
         end
       end
 
-      def getMultiNodeAttribute(graphName, nodeIds, attributeName)
-        id_to_json = get_executor.getMultiNodeAttributeAsJSON(graphName, nodeIds, attributeName)
+      def get_multi_node_attribute(node_type, nodeIds, attribute_name)
+        id_to_json = @thrift_client.with_retries { |executor|
+          executor.getMultiNodeAttributeAsJSON(node_type, nodeIds, attribute_name)
+        }
         Hash[id_to_json.map{ |k,v| [k, TempestClient.jsonToValue(v)] }]
       end
 
-      def getNodeAttribute(graphName, nodeId, attributeName)
-        self.getMultiNodeAttribute(graphName, [nodeId], attributeName)[nodeId]
+      def get_node_attribute(node_type, nodeId, attribute_name)
+        self.get_multi_node_attribute(node_type, [nodeId], attribute_name)[nodeId]
       end
 
-      def kStepOutNeighborsFiltered(edgeType, sourceId, k, sqlClause: "", degreeFilter: {}, alternating: true)
-        get_executor.kStepOutNeighborsFiltered(edgeType, sourceId, k, sqlClause, degreeFilter, alternating)
+      def k_step_out_neighbors_filtered(edge_type, source_id, k, sql_clause: "", degree_filter: {}, alternating: true)
+        @thrift_client.with_retries { |executor|
+          executor.kStepOutNeighborsFiltered(edge_type, source_id, k, sql_clause, degree_filter, alternating)
+        }
+      end
+
+      def k_step_in_neighbors_filtered(edge_type, source_id, k, sql_clause: "", degree_filter: {}, alternating: true)
+        @thrift_client.with_retries { |executor|
+          executor.kStepInNeighborsFiltered(edge_type, source_id, k, sql_clause, degree_filter, alternating)
+        }
+      end
+
+      # Convenience method to return the unique node id satisfying a condition
+      def unique_node(node_type, sql_clause)
+        matching_nodes = @thrift_client.with_retries { |executor|
+          executor.nodes(node_type, sql_clause)
+        }
+        if matching_nodes.length != 1
+          raise "Error: clause '#{sql_clause}' had #{matching_nodes.length} results"
+        end
+        matching_nodes[0]
       end
-      def kStepInNeighborsFiltered(edgeType, sourceId, k, sqlClause: "", degreeFilter: {}, alternating: true)
-        get_executor.kStepInNeighborsFiltered(edgeType, sourceId, k, sqlClause, degreeFilter, alternating)
+
+
+      # TODO: For methods that only need to be included (for irb auto-complete) and converted from camelCase to
+      # snake_case, is there a simple way of automating this?
+      def out_degree(edge_type, id)
+        @thrift_client.with_retries { |executor|
+          executor.outDegree(edge_type, id)
+        }
+      end
+
+      def in_degree(edge_type, id)
+        @thrift_client.with_retries { |executor|
+          executor.inDegree(edge_type, id)
+        }
+      end
+
+      def out_neighbors(edge_type, id)
+        @thrift_client.with_retries { |executor|
+          executor.outNeighbors(edge_type, id)
+        }
+      end
+
+      def in_neighbors(edge_type, id)
+        @thrift_client.with_retries { |executor|
+          executor.inNeighbors(edge_type, id)
+        }
+      end
+
+      def out_neighbor(edge_type, id, i)
+        @thrift_client.with_retries { |executor|
+          executor.outNeighbor(edge_type, id, i)
+        }
+      end
+
+      def in_neighbor(edge_type, id, i)
+        @thrift_client.with_retries { |executor|
+          executor.inNeighbor(edge_type, id, i)
+        }
+      end
+
+      def max_node_id(edge_type)
+        @thrift_client.with_retries { |executor|
+          executor.maxNodeId(edge_type)
+        }
+      end
+
+      def node_count(edge_type)
+        @thrift_client.with_retries { |executor|
+          executor.nodeCount(edge_type)
+        }
+      end
+
+      def edge_count(edge_type)
+        @thrift_client.with_retries { |executor|
+          executor.edgeCount(edge_type)
+        }
+      end
+
+      def ppr_single_target(edge_type, seed_node_ids, target_node_id, bi_ppr_params)
+        @thrift_client.with_retries { |executor|
+          executor.pprSingleTarget(edge_type, seed_node_ids, target_node_id, bi_ppr_params)
+        }
+      end
+
+      def ppr(edge_type, seed_node_ids, seed_node_type, target_node_type, mc_ppr_params)
+        @thrift_client.with_retries { |executor|
+          executor.ppr(edge_type, seed_node_ids, seed_node_type, target_node_type, mc_ppr_params)
+        }
+      end
+
+      def nodes(node_type, sql_clause)
+        @thrift_client.with_retries { |executor|
+          executor.nodes(node_type, sql_clause)
+        }
       end
 
-      # Delegate other methods to the thrift generated method
-      # Note: for autocomplete and documentation, we could improve usability by listing methods
-      # explicitly (as we do for python), but that would require manual changes whenever the thrift
-      # api changes, so for ruby we automatically delegate all other methods.
-      def method_missing(m, *args)
-        get_executor.send m, *args
+      def add_edges(edge_type, ids1, ids2)
+        @thrift_client.with_retries { |executor|
+          executor.addEdges(edge_type, ids1, ids2)
+        }
       end
     end
   end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tempest_db
 version: !ruby/object:Gem::Version
-  version: 0.12.1
-  prerelease: 
+  version: 0.13.2
 platform: ruby
 authors:
 - Peter Lofgren
@@ -11,10 +10,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2016-12-19 00:00:00.000000000 Z
 dependencies: []
 description: Client for Tempest Graph Database.
-email: peter@teapot.co
+email: peterl@stripe.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -30,26 +29,26 @@ files:
 homepage: http://teapot.co
 licenses:
 - Apache 2
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Client for Tempest Graph Database
 test_files: []
+has_rdoc: