google-api-client 0.16.0 → 0.17.0

data/generated/google/apis/content_v2.rb

@@ -26,7 +26,7 @@ module Google
     # @see https://developers.google.com/shopping-content
     module ContentV2
       VERSION = 'V2'
-      REVISION = '20171020'
+      REVISION = '20171102'
 
       # Manage your product listings and accounts for Google Shopping
       AUTH_CONTENT = 'https://www.googleapis.com/auth/content'

data/generated/google/apis/content_v2/classes.rb

@@ -2702,11 +2702,6 @@ module Google
         # @return [Array<Google::Apis::ContentV2::OrderCancellation>]
         attr_accessor :cancellations
       
-        # The channel type of the order: "purchaseOnGoogle" or "googleExpress".
-        # Corresponds to the JSON property `channelType`
-        # @return [String]
-        attr_accessor :channel_type
-      
         # The id of the line item.
         # Corresponds to the JSON property `id`
         # @return [String]
@@ -2781,7 +2776,6 @@ module Google
         # Update properties of this object
         def update!(**args)
           @cancellations = args[:cancellations] if args.key?(:cancellations)
-          @channel_type = args[:channel_type] if args.key?(:channel_type)
           @id = args[:id] if args.key?(:id)
           @price = args[:price] if args.key?(:price)
           @product = args[:product] if args.key?(:product)
@@ -3363,7 +3357,8 @@ module Google
       class OrderShipmentLineItemShipment
         include Google::Apis::Core::Hashable
       
-        # The id of the line item that is shipped.
+        # The id of the line item that is shipped. Either lineItemId or productId is
+        # required.
         # Corresponds to the JSON property `lineItemId`
         # @return [String]
         attr_accessor :line_item_id
@@ -3460,7 +3455,7 @@ module Google
         # @return [Google::Apis::ContentV2::Price]
         attr_accessor :amount
       
-        # The ID of the line item to cancel.
+        # The ID of the line item to cancel. Either lineItemId or productId is required.
         # Corresponds to the JSON property `lineItemId`
         # @return [String]
         attr_accessor :line_item_id
@@ -3778,7 +3773,7 @@ module Google
         # @return [Google::Apis::ContentV2::Price]
         attr_accessor :amount
       
-        # The ID of the line item to cancel.
+        # The ID of the line item to cancel. Either lineItemId or productId is required.
         # Corresponds to the JSON property `lineItemId`
         # @return [String]
         attr_accessor :line_item_id
@@ -3847,7 +3842,7 @@ module Google
       class OrdersCustomBatchRequestEntryReturnLineItem
         include Google::Apis::Core::Hashable
       
-        # The ID of the line item to return.
+        # The ID of the line item to return. Either lineItemId or productId is required.
         # Corresponds to the JSON property `lineItemId`
         # @return [String]
         attr_accessor :line_item_id
@@ -4219,7 +4214,7 @@ module Google
       class OrdersReturnLineItemRequest
         include Google::Apis::Core::Hashable
       
-        # The ID of the line item to return.
+        # The ID of the line item to return. Either lineItemId or productId is required.
         # Corresponds to the JSON property `lineItemId`
         # @return [String]
         attr_accessor :line_item_id

data/generated/google/apis/content_v2/representations.rb

@@ -1722,7 +1722,6 @@ module Google
         class Representation < Google::Apis::Core::JsonRepresentation
           collection :cancellations, as: 'cancellations', class: Google::Apis::ContentV2::OrderCancellation, decorator: Google::Apis::ContentV2::OrderCancellation::Representation
       
-          property :channel_type, as: 'channelType'
           property :id, as: 'id'
           property :price, as: 'price', class: Google::Apis::ContentV2::Price, decorator: Google::Apis::ContentV2::Price::Representation
       

data/generated/google/apis/content_v2sandbox.rb

@@ -26,7 +26,7 @@ module Google
     # @see https://developers.google.com/shopping-content
     module ContentV2sandbox
       VERSION = 'V2sandbox'
-      REVISION = '20171020'
+      REVISION = '20171102'
 
       # Manage your product listings and accounts for Google Shopping
       AUTH_CONTENT = 'https://www.googleapis.com/auth/content'

data/generated/google/apis/content_v2sandbox/classes.rb

@@ -404,11 +404,6 @@ module Google
         # @return [Array<Google::Apis::ContentV2sandbox::OrderCancellation>]
         attr_accessor :cancellations
       
-        # The channel type of the order: "purchaseOnGoogle" or "googleExpress".
-        # Corresponds to the JSON property `channelType`
-        # @return [String]
-        attr_accessor :channel_type
-      
         # The id of the line item.
         # Corresponds to the JSON property `id`
         # @return [String]
@@ -483,7 +478,6 @@ module Google
         # Update properties of this object
         def update!(**args)
           @cancellations = args[:cancellations] if args.key?(:cancellations)
-          @channel_type = args[:channel_type] if args.key?(:channel_type)
           @id = args[:id] if args.key?(:id)
           @price = args[:price] if args.key?(:price)
           @product = args[:product] if args.key?(:product)
@@ -1065,7 +1059,8 @@ module Google
       class OrderShipmentLineItemShipment
         include Google::Apis::Core::Hashable
       
-        # The id of the line item that is shipped.
+        # The id of the line item that is shipped. Either lineItemId or productId is
+        # required.
         # Corresponds to the JSON property `lineItemId`
         # @return [String]
         attr_accessor :line_item_id
@@ -1162,7 +1157,7 @@ module Google
         # @return [Google::Apis::ContentV2sandbox::Price]
         attr_accessor :amount
       
-        # The ID of the line item to cancel.
+        # The ID of the line item to cancel. Either lineItemId or productId is required.
         # Corresponds to the JSON property `lineItemId`
         # @return [String]
         attr_accessor :line_item_id
@@ -1480,7 +1475,7 @@ module Google
         # @return [Google::Apis::ContentV2sandbox::Price]
         attr_accessor :amount
       
-        # The ID of the line item to cancel.
+        # The ID of the line item to cancel. Either lineItemId or productId is required.
         # Corresponds to the JSON property `lineItemId`
         # @return [String]
         attr_accessor :line_item_id
@@ -1549,7 +1544,7 @@ module Google
       class OrdersCustomBatchRequestEntryReturnLineItem
         include Google::Apis::Core::Hashable
       
-        # The ID of the line item to return.
+        # The ID of the line item to return. Either lineItemId or productId is required.
         # Corresponds to the JSON property `lineItemId`
         # @return [String]
         attr_accessor :line_item_id
@@ -1921,7 +1916,7 @@ module Google
       class OrdersReturnLineItemRequest
         include Google::Apis::Core::Hashable
       
-        # The ID of the line item to return.
+        # The ID of the line item to return. Either lineItemId or productId is required.
         # Corresponds to the JSON property `lineItemId`
         # @return [String]
         attr_accessor :line_item_id

data/generated/google/apis/content_v2sandbox/representations.rb

@@ -479,7 +479,6 @@ module Google
         class Representation < Google::Apis::Core::JsonRepresentation
           collection :cancellations, as: 'cancellations', class: Google::Apis::ContentV2sandbox::OrderCancellation, decorator: Google::Apis::ContentV2sandbox::OrderCancellation::Representation
       
-          property :channel_type, as: 'channelType'
           property :id, as: 'id'
           property :price, as: 'price', class: Google::Apis::ContentV2sandbox::Price, decorator: Google::Apis::ContentV2sandbox::Price::Representation
       

data/generated/google/apis/dataproc_v1.rb

@@ -25,7 +25,7 @@ module Google
     # @see https://cloud.google.com/dataproc/
     module DataprocV1
       VERSION = 'V1'
-      REVISION = '20170822'
+      REVISION = '20171031'
 
       # View and manage your data across Google Cloud Platform services
       AUTH_CLOUD_PLATFORM = 'https://www.googleapis.com/auth/cloud-platform'

data/generated/google/apis/dataproc_v1/service.rb

@@ -446,13 +446,13 @@ module Google
         #   Optional. A filter constraining the jobs to list. Filters are case-sensitive
         #   and have the following syntax:field = value AND field = value ...where field
         #   is status.state or labels.[KEY], and [KEY] is a label key. value can be * to
-        #   match all values. status.state can be either ACTIVE or INACTIVE. Only the
+        #   match all values. status.state can be either ACTIVE or NON_ACTIVE. Only the
         #   logical AND operator is supported; space-separated items are treated as having
         #   an implicit AND operator.Example filter:status.state = ACTIVE AND labels.env =
         #   staging AND labels.starred = *
         # @param [String] job_state_matcher
-        #   Optional. Specifies enumerated categories of jobs to list (default = match ALL
-        #   jobs).
+        #   Optional. Specifies enumerated categories of jobs to list. (default = match
+        #   ALL jobs).If filter is provided, jobStateMatcher will be ignored.
         # @param [Fixnum] page_size
         #   Optional. The number of results to return in each response.
         # @param [String] page_token

data/generated/google/apis/dataproc_v1beta2.rb

@@ -25,7 +25,7 @@ module Google
     # @see https://cloud.google.com/dataproc/
     module DataprocV1beta2
       VERSION = 'V1beta2'
-      REVISION = '20171010'
+      REVISION = '20171031'
 
       # View and manage your data across Google Cloud Platform services
       AUTH_CLOUD_PLATFORM = 'https://www.googleapis.com/auth/cloud-platform'

data/generated/google/apis/dataproc_v1beta2/service.rb

@@ -788,13 +788,13 @@ module Google
         #   Optional. A filter constraining the jobs to list. Filters are case-sensitive
         #   and have the following syntax:field = value AND field = value ...where field
         #   is status.state or labels.[KEY], and [KEY] is a label key. value can be * to
-        #   match all values. status.state can be either ACTIVE or INACTIVE. Only the
+        #   match all values. status.state can be either ACTIVE or NON_ACTIVE. Only the
         #   logical AND operator is supported; space-separated items are treated as having
         #   an implicit AND operator.Example filter:status.state = ACTIVE AND labels.env =
         #   staging AND labels.starred = *
         # @param [String] job_state_matcher
-        #   Optional. Specifies enumerated categories of jobs to list (default = match ALL
-        #   jobs).
+        #   Optional. Specifies enumerated categories of jobs to list. (default = match
+        #   ALL jobs).If filter is provided, jobStateMatcher will be ignored.
         # @param [Fixnum] page_size
         #   Optional. The number of results to return in each response.
         # @param [String] page_token

data/generated/google/apis/videointelligence_v1beta1.rb

@@ -25,7 +25,7 @@ module Google
     # @see https://cloud.google.com/video-intelligence/docs/
     module VideointelligenceV1beta1
       VERSION = 'V1beta1'
-      REVISION = '20171031'
+      REVISION = '20171104'
 
       # View and manage your data across Google Cloud Platform services
       AUTH_CLOUD_PLATFORM = 'https://www.googleapis.com/auth/cloud-platform'

data/generated/google/apis/videointelligence_v1beta1/classes.rb

@@ -64,8 +64,8 @@ module Google
         end
       end
       
-      # Label annotation.
-      class GoogleCloudVideointelligenceV1LabelAnnotation
+      # Detected entity from video analysis.
+      class GoogleCloudVideointelligenceV1Entity
         include Google::Apis::Core::Hashable
       
         # Textual description, e.g. `Fixed-gear bicycle`.
@@ -73,16 +73,18 @@ module Google
         # @return [String]
         attr_accessor :description
       
+        # Opaque entity ID. Some IDs may be available in
+        # [Google Knowledge Graph Search
+        # API](https://developers.google.com/knowledge-graph/).
+        # Corresponds to the JSON property `entityId`
+        # @return [String]
+        attr_accessor :entity_id
+      
         # Language code for `description` in BCP-47 format.
         # Corresponds to the JSON property `languageCode`
         # @return [String]
         attr_accessor :language_code
       
-        # Where the label was detected and with what confidence.
-        # Corresponds to the JSON property `locations`
-        # @return [Array<Google::Apis::VideointelligenceV1beta1::GoogleCloudVideointelligenceV1LabelLocation>]
-        attr_accessor :locations
-      
         def initialize(**args)
            update!(**args)
         end
@@ -90,13 +92,100 @@ module Google
         # Update properties of this object
         def update!(**args)
           @description = args[:description] if args.key?(:description)
+          @entity_id = args[:entity_id] if args.key?(:entity_id)
           @language_code = args[:language_code] if args.key?(:language_code)
-          @locations = args[:locations] if args.key?(:locations)
         end
       end
       
-      # Label location.
-      class GoogleCloudVideointelligenceV1LabelLocation
+      # Explicit content annotation (based on per-frame visual signals only).
+      # If no explicit content has been detected in a frame, no annotations are
+      # present for that frame.
+      class GoogleCloudVideointelligenceV1ExplicitContentAnnotation
+        include Google::Apis::Core::Hashable
+      
+        # All video frames where explicit content was detected.
+        # Corresponds to the JSON property `frames`
+        # @return [Array<Google::Apis::VideointelligenceV1beta1::GoogleCloudVideointelligenceV1ExplicitContentFrame>]
+        attr_accessor :frames
+      
+        def initialize(**args)
+           update!(**args)
+        end
+      
+        # Update properties of this object
+        def update!(**args)
+          @frames = args[:frames] if args.key?(:frames)
+        end
+      end
+      
+      # Video frame level annotation results for explicit content.
+      class GoogleCloudVideointelligenceV1ExplicitContentFrame
+        include Google::Apis::Core::Hashable
+      
+        # Likelihood of the pornography content..
+        # Corresponds to the JSON property `pornographyLikelihood`
+        # @return [String]
+        attr_accessor :pornography_likelihood
+      
+        # Time-offset, relative to the beginning of the video, corresponding to the
+        # video frame for this location.
+        # Corresponds to the JSON property `timeOffset`
+        # @return [String]
+        attr_accessor :time_offset
+      
+        def initialize(**args)
+           update!(**args)
+        end
+      
+        # Update properties of this object
+        def update!(**args)
+          @pornography_likelihood = args[:pornography_likelihood] if args.key?(:pornography_likelihood)
+          @time_offset = args[:time_offset] if args.key?(:time_offset)
+        end
+      end
+      
+      # Label annotation.
+      class GoogleCloudVideointelligenceV1LabelAnnotation
+        include Google::Apis::Core::Hashable
+      
+        # Common categories for the detected entity.
+        # E.g. when the label is `Terrier` the category is likely `dog`. And in some
+        # cases there might be more than one categories e.g. `Terrier` could also be
+        # a `pet`.
+        # Corresponds to the JSON property `categoryEntities`
+        # @return [Array<Google::Apis::VideointelligenceV1beta1::GoogleCloudVideointelligenceV1Entity>]
+        attr_accessor :category_entities
+      
+        # Detected entity from video analysis.
+        # Corresponds to the JSON property `entity`
+        # @return [Google::Apis::VideointelligenceV1beta1::GoogleCloudVideointelligenceV1Entity]
+        attr_accessor :entity
+      
+        # All video frames where a label was detected.
+        # Corresponds to the JSON property `frames`
+        # @return [Array<Google::Apis::VideointelligenceV1beta1::GoogleCloudVideointelligenceV1LabelFrame>]
+        attr_accessor :frames
+      
+        # All video segments where a label was detected.
+        # Corresponds to the JSON property `segments`
+        # @return [Array<Google::Apis::VideointelligenceV1beta1::GoogleCloudVideointelligenceV1LabelSegment>]
+        attr_accessor :segments
+      
+        def initialize(**args)
+           update!(**args)
+        end
+      
+        # Update properties of this object
+        def update!(**args)
+          @category_entities = args[:category_entities] if args.key?(:category_entities)
+          @entity = args[:entity] if args.key?(:entity)
+          @frames = args[:frames] if args.key?(:frames)
+          @segments = args[:segments] if args.key?(:segments)
+        end
+      end
+      
+      # Video frame level annotation results for label detection.
+      class GoogleCloudVideointelligenceV1LabelFrame
         include Google::Apis::Core::Hashable
       
         # Confidence that the label is accurate. Range: [0, 1].
@@ -104,15 +193,11 @@ module Google
         # @return [Float]
         attr_accessor :confidence
       
-        # Label level.
-        # Corresponds to the JSON property `level`
+        # Time-offset, relative to the beginning of the video, corresponding to the
+        # video frame for this location.
+        # Corresponds to the JSON property `timeOffset`
         # @return [String]
-        attr_accessor :level
-      
-        # Video segment.
-        # Corresponds to the JSON property `segment`
-        # @return [Google::Apis::VideointelligenceV1beta1::GoogleCloudVideointelligenceV1VideoSegment]
-        attr_accessor :segment
+        attr_accessor :time_offset
       
         def initialize(**args)
            update!(**args)
@@ -121,27 +206,23 @@ module Google
         # Update properties of this object
         def update!(**args)
           @confidence = args[:confidence] if args.key?(:confidence)
-          @level = args[:level] if args.key?(:level)
-          @segment = args[:segment] if args.key?(:segment)
+          @time_offset = args[:time_offset] if args.key?(:time_offset)
         end
       end
       
-      # Safe search annotation (based on per-frame visual signals only).
-      # If no unsafe content has been detected in a frame, no annotations
-      # are present for that frame.
-      class GoogleCloudVideointelligenceV1SafeSearchAnnotation
+      # Video segment level annotation results for label detection.
+      class GoogleCloudVideointelligenceV1LabelSegment
         include Google::Apis::Core::Hashable
       
-        # Likelihood of adult content.
-        # Corresponds to the JSON property `adult`
-        # @return [String]
-        attr_accessor :adult
+        # Confidence that the label is accurate. Range: [0, 1].
+        # Corresponds to the JSON property `confidence`
+        # @return [Float]
+        attr_accessor :confidence
       
-        # Time-offset, relative to the beginning of the video,
-        # corresponding to the video frame for this annotation.
-        # Corresponds to the JSON property `time`
-        # @return [String]
-        attr_accessor :time
+        # Video segment.
+        # Corresponds to the JSON property `segment`
+        # @return [Google::Apis::VideointelligenceV1beta1::GoogleCloudVideointelligenceV1VideoSegment]
+        attr_accessor :segment
       
         def initialize(**args)
            update!(**args)
@@ -149,8 +230,8 @@ module Google
       
         # Update properties of this object
         def update!(**args)
-          @adult = args[:adult] if args.key?(:adult)
-          @time = args[:time] if args.key?(:time)
+          @confidence = args[:confidence] if args.key?(:confidence)
+          @segment = args[:segment] if args.key?(:segment)
         end
       end
       
@@ -240,27 +321,42 @@ module Google
         # @return [Google::Apis::VideointelligenceV1beta1::GoogleRpcStatus]
         attr_accessor :error
       
+        # Explicit content annotation (based on per-frame visual signals only).
+        # If no explicit content has been detected in a frame, no annotations are
+        # present for that frame.
+        # Corresponds to the JSON property `explicitAnnotation`
+        # @return [Google::Apis::VideointelligenceV1beta1::GoogleCloudVideointelligenceV1ExplicitContentAnnotation]
+        attr_accessor :explicit_annotation
+      
+        # Label annotations on frame level.
+        # There is exactly one element for each unique label.
+        # Corresponds to the JSON property `frameLabelAnnotations`
+        # @return [Array<Google::Apis::VideointelligenceV1beta1::GoogleCloudVideointelligenceV1LabelAnnotation>]
+        attr_accessor :frame_label_annotations
+      
         # Video file location in
         # [Google Cloud Storage](https://cloud.google.com/storage/).
         # Corresponds to the JSON property `inputUri`
         # @return [String]
         attr_accessor :input_uri
       
-        # Label annotations. There is exactly one element for each unique label.
-        # Corresponds to the JSON property `labelAnnotations`
+        # Label annotations on video level or user specified segment level.
+        # There is exactly one element for each unique label.
+        # Corresponds to the JSON property `segmentLabelAnnotations`
         # @return [Array<Google::Apis::VideointelligenceV1beta1::GoogleCloudVideointelligenceV1LabelAnnotation>]
-        attr_accessor :label_annotations
-      
-        # Safe search annotations.
-        # Corresponds to the JSON property `safeSearchAnnotations`
-        # @return [Array<Google::Apis::VideointelligenceV1beta1::GoogleCloudVideointelligenceV1SafeSearchAnnotation>]
-        attr_accessor :safe_search_annotations
+        attr_accessor :segment_label_annotations
       
         # Shot annotations. Each shot is represented as a video segment.
         # Corresponds to the JSON property `shotAnnotations`
         # @return [Array<Google::Apis::VideointelligenceV1beta1::GoogleCloudVideointelligenceV1VideoSegment>]
         attr_accessor :shot_annotations
       
+        # Label annotations on shot level.
+        # There is exactly one element for each unique label.
+        # Corresponds to the JSON property `shotLabelAnnotations`
+        # @return [Array<Google::Apis::VideointelligenceV1beta1::GoogleCloudVideointelligenceV1LabelAnnotation>]
+        attr_accessor :shot_label_annotations
+      
         def initialize(**args)
            update!(**args)
         end
@@ -268,10 +364,12 @@ module Google
         # Update properties of this object
         def update!(**args)
           @error = args[:error] if args.key?(:error)
+          @explicit_annotation = args[:explicit_annotation] if args.key?(:explicit_annotation)
+          @frame_label_annotations = args[:frame_label_annotations] if args.key?(:frame_label_annotations)
           @input_uri = args[:input_uri] if args.key?(:input_uri)
-          @label_annotations = args[:label_annotations] if args.key?(:label_annotations)
-          @safe_search_annotations = args[:safe_search_annotations] if args.key?(:safe_search_annotations)
+          @segment_label_annotations = args[:segment_label_annotations] if args.key?(:segment_label_annotations)
           @shot_annotations = args[:shot_annotations] if args.key?(:shot_annotations)
+          @shot_label_annotations = args[:shot_label_annotations] if args.key?(:shot_label_annotations)
         end
       end
       
@@ -281,15 +379,15 @@ module Google
       
         # Time-offset, relative to the beginning of the video,
         # corresponding to the end of the segment (inclusive).
-        # Corresponds to the JSON property `endTime`
+        # Corresponds to the JSON property `endTimeOffset`
         # @return [String]
-        attr_accessor :end_time
+        attr_accessor :end_time_offset
       
         # Time-offset, relative to the beginning of the video,
         # corresponding to the start of the segment (inclusive).
-        # Corresponds to the JSON property `startTime`
+        # Corresponds to the JSON property `startTimeOffset`
         # @return [String]
-        attr_accessor :start_time
+        attr_accessor :start_time_offset
       
         def initialize(**args)
            update!(**args)
@@ -297,8 +395,8 @@ module Google
       
         # Update properties of this object
         def update!(**args)
-          @end_time = args[:end_time] if args.key?(:end_time)
-          @start_time = args[:start_time] if args.key?(:start_time)
+          @end_time_offset = args[:end_time_offset] if args.key?(:end_time_offset)
+          @start_time_offset = args[:start_time_offset] if args.key?(:start_time_offset)
         end
       end