pharmaobservatory 0.1.10 → 0.1.12

data/lib/pharmaobservatory/models/biomarker_assay_providers_row.rb

@@ -40,13 +40,13 @@ module PharmaObservatory
     # The provider company name as it appears in the papers.
     attr_accessor :provider_name
 
-    # The provider's legal entity key, where the marketplace match resolves one.
+    # The organization the provider's company name resolved to (the member organization, not its parent); null when the provider is ambiguous or unresolved. Reached by the rung named in provider_org_match_tier.
     attr_accessor :provider_org_id
 
-    # How the provider was resolved to an organization. rx_provider_link: through its marketplace supplier. unresolved: no organization, the provider stays a name. The remaining values are reserved for resolution rungs that have not shipped.
+    # How the provider was resolved to an organization, first rung that yields one organization wins. alias_exact: a reviewed brand alias, then exactly one organization carries the name. name_exact: exactly one organization carries the name. parent_unanimous: several organizations carry the name and all roll up to one parent, which is the organization. sponsor_key: the name is a trial-sponsor key. rx_provider_link: through its marketplace supplier. ambiguous: organizations under more than one parent carry the name, so none is chosen. unresolved: no organization, the provider stays a name.
     attr_accessor :provider_org_match_tier
 
-    # The ultimate parent organization of the provider's organization; null when the provider has no organization.
+    # The resolved parent of provider_org_id in the organization hierarchy (the organization itself when it has none); null when the provider has no organization. The hierarchy is not guaranteed correct for every company, so read it with provider_org_match_tier.
     attr_accessor :provider_parent_org_id
 
     # The provider's company key.
@@ -100,14 +100,65 @@ module PharmaObservatory
     # True when the provider matches a marketplace supplier or at least two papers name the pair.
     attr_accessor :meets_curated_threshold
 
-    # The company-level class. diagnostic_provider makes or supplies the diagnostic assay; reagent_supplier is the vendor whose kit appears in a methods section; context_dependent, pharma_or_other and not_a_company are the other decisions; unclassified means no decision yet.
-    attr_accessor :assay_provider_class
+    # The strongest US FDA or CMS record found for the pair. companion_diagnostic: the provider holds an FDA companion diagnostic for the biomarker. fda_cleared_specific_assay: a cleared or approved device of the provider that the paper names and that measures the biomarker. fda_cleared_for_biomarker: the provider holds a cleared or approved IVD under a product code for the biomarker. clia_testing_service: the provider is named as a testing service and its own organization holds a CLIA certificate. fda_ivd_company_only: the provider holds some cleared or approved IVD, none matched to the biomarker. none: no FDA record found.
+    attr_accessor :regulatory_evidence_kind
 
-    # Where the class decision came from; null when unclassified.
-    attr_accessor :assay_provider_class_source
+    # True when regulatory_evidence_kind is one of the first four kinds, a record that concerns the biomarker rather than only the company.
+    attr_accessor :has_fda_record_for_biomarker
 
-    # When the class was decided, in UTC; null when unclassified.
-    attr_accessor :assay_provider_class_decided_at
+    # Every level that held for the pair, strongest first; empty when none did.
+    attr_accessor :regulatory_evidence_reasons
+
+    # The 510(k) clearances in the in-vitro diagnostic review panels held by the provider's organization (or, when it holds none, by organizations under its parent; fda_company_match_rung says which). Null for a provider that did not resolve to an organization.
+    attr_accessor :n_fda_ivd_510k
+
+    # The PMA approvals (distinct approval numbers) in the in-vitro diagnostic review panels held by the provider's organization or its parent family, on the same rung as n_fda_ivd_510k. Null for a provider that did not resolve to an organization.
+    attr_accessor :n_fda_ivd_pma
+
+    # org: the counted records are held by the provider's own organization. parent: by organizations under the same resolved parent. Null when the provider holds none.
+    attr_accessor :fda_company_match_rung
+
+    # The provider's 510(k) clearances under a product code mapped to this biomarker. Null when the provider or the biomarker did not resolve.
+    attr_accessor :n_fda_analyte_510k
+
+    # The provider's PMA approvals under a product code mapped to this biomarker. Null when the provider or the biomarker did not resolve.
+    attr_accessor :n_fda_analyte_pma
+
+    # The FDA product codes behind n_fda_analyte_510k and n_fda_analyte_pma.
+    attr_accessor :fda_analyte_product_codes
+
+    # The FDA database page of the provider's most recent record under a product code for this biomarker.
+    attr_accessor :fda_analyte_fda_url
+
+    # True when a paper names a cleared or approved device of this provider that measures this biomarker. The device name matches the paper's assay name, or the company's own quote, and the device's analyte agrees with the biomarker.
+    attr_accessor :specific_assay_matched
+
+    # The 510(k) device name or PMA trade name of the matched device; the best match when several matched. Null when no device matched.
+    attr_accessor :specific_assay_device_name
+
+    # The 510(k) number of the matched device; null when the match is a PMA or there is none.
+    attr_accessor :specific_assay_k_number
+
+    # The PMA number of the matched device; null when the match is a 510(k) or there is none.
+    attr_accessor :specific_assay_pma_number
+
+    # The FDA database page of the matched device.
+    attr_accessor :specific_assay_fda_url
+
+    # The trigram text similarity (0 to 1) of the larger of the two text clauses that matched the device, the paper's assay name or the company's quote against the device name.
+    attr_accessor :specific_assay_similarity
+
+    # The FDA companion diagnostic list entries for this biomarker from this provider's organization (or its parent family). Null when the provider or the biomarker did not resolve.
+    attr_accessor :n_cdx_entries
+
+    # The names of those companion diagnostics.
+    attr_accessor :cdx_diagnostic_names
+
+    # The CLIA (US clinical laboratory) certificates held by the provider's organization, or by organizations under its parent when it holds none (clia_match_rung says which). A certificate licenses a lab; it is not evidence that any named assay is run. Null for a provider that did not resolve to an organization.
+    attr_accessor :n_clia_certificates
+
+    # org: the counted certificates are held by the provider's own organization. parent: by organizations under the same resolved parent. Null when the provider holds none.
+    attr_accessor :clia_match_rung
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
@@ -140,9 +191,26 @@ module PharmaObservatory
         :'most_recent_pmid' => :'most_recent_pmid',
         :'most_recent_title' => :'most_recent_title',
         :'meets_curated_threshold' => :'meets_curated_threshold',
-        :'assay_provider_class' => :'assay_provider_class',
-        :'assay_provider_class_source' => :'assay_provider_class_source',
-        :'assay_provider_class_decided_at' => :'assay_provider_class_decided_at'
+        :'regulatory_evidence_kind' => :'regulatory_evidence_kind',
+        :'has_fda_record_for_biomarker' => :'has_fda_record_for_biomarker',
+        :'regulatory_evidence_reasons' => :'regulatory_evidence_reasons',
+        :'n_fda_ivd_510k' => :'n_fda_ivd_510k',
+        :'n_fda_ivd_pma' => :'n_fda_ivd_pma',
+        :'fda_company_match_rung' => :'fda_company_match_rung',
+        :'n_fda_analyte_510k' => :'n_fda_analyte_510k',
+        :'n_fda_analyte_pma' => :'n_fda_analyte_pma',
+        :'fda_analyte_product_codes' => :'fda_analyte_product_codes',
+        :'fda_analyte_fda_url' => :'fda_analyte_fda_url',
+        :'specific_assay_matched' => :'specific_assay_matched',
+        :'specific_assay_device_name' => :'specific_assay_device_name',
+        :'specific_assay_k_number' => :'specific_assay_k_number',
+        :'specific_assay_pma_number' => :'specific_assay_pma_number',
+        :'specific_assay_fda_url' => :'specific_assay_fda_url',
+        :'specific_assay_similarity' => :'specific_assay_similarity',
+        :'n_cdx_entries' => :'n_cdx_entries',
+        :'cdx_diagnostic_names' => :'cdx_diagnostic_names',
+        :'n_clia_certificates' => :'n_clia_certificates',
+        :'clia_match_rung' => :'clia_match_rung'
       }
     end
 
@@ -187,9 +255,26 @@ module PharmaObservatory
         :'most_recent_pmid' => :'String',
         :'most_recent_title' => :'String',
         :'meets_curated_threshold' => :'Boolean',
-        :'assay_provider_class' => :'String',
-        :'assay_provider_class_source' => :'String',
-        :'assay_provider_class_decided_at' => :'Time'
+        :'regulatory_evidence_kind' => :'String',
+        :'has_fda_record_for_biomarker' => :'Boolean',
+        :'regulatory_evidence_reasons' => :'Array<String>',
+        :'n_fda_ivd_510k' => :'Integer',
+        :'n_fda_ivd_pma' => :'Integer',
+        :'fda_company_match_rung' => :'String',
+        :'n_fda_analyte_510k' => :'Integer',
+        :'n_fda_analyte_pma' => :'Integer',
+        :'fda_analyte_product_codes' => :'Array<String>',
+        :'fda_analyte_fda_url' => :'String',
+        :'specific_assay_matched' => :'Boolean',
+        :'specific_assay_device_name' => :'String',
+        :'specific_assay_k_number' => :'String',
+        :'specific_assay_pma_number' => :'String',
+        :'specific_assay_fda_url' => :'String',
+        :'specific_assay_similarity' => :'Float',
+        :'n_cdx_entries' => :'Integer',
+        :'cdx_diagnostic_names' => :'Array<String>',
+        :'n_clia_certificates' => :'Integer',
+        :'clia_match_rung' => :'String'
       }
     end
 
@@ -224,9 +309,26 @@ module PharmaObservatory
         :'most_recent_pmid',
         :'most_recent_title',
         :'meets_curated_threshold',
-        :'assay_provider_class',
-        :'assay_provider_class_source',
-        :'assay_provider_class_decided_at'
+        :'regulatory_evidence_kind',
+        :'has_fda_record_for_biomarker',
+        :'regulatory_evidence_reasons',
+        :'n_fda_ivd_510k',
+        :'n_fda_ivd_pma',
+        :'fda_company_match_rung',
+        :'n_fda_analyte_510k',
+        :'n_fda_analyte_pma',
+        :'fda_analyte_product_codes',
+        :'fda_analyte_fda_url',
+        :'specific_assay_matched',
+        :'specific_assay_device_name',
+        :'specific_assay_k_number',
+        :'specific_assay_pma_number',
+        :'specific_assay_fda_url',
+        :'specific_assay_similarity',
+        :'n_cdx_entries',
+        :'cdx_diagnostic_names',
+        :'n_clia_certificates',
+        :'clia_match_rung'
       ])
     end
 
@@ -358,16 +460,90 @@ module PharmaObservatory
         self.meets_curated_threshold = attributes[:'meets_curated_threshold']
       end
 
-      if attributes.key?(:'assay_provider_class')
-        self.assay_provider_class = attributes[:'assay_provider_class']
+      if attributes.key?(:'regulatory_evidence_kind')
+        self.regulatory_evidence_kind = attributes[:'regulatory_evidence_kind']
+      end
+
+      if attributes.key?(:'has_fda_record_for_biomarker')
+        self.has_fda_record_for_biomarker = attributes[:'has_fda_record_for_biomarker']
+      end
+
+      if attributes.key?(:'regulatory_evidence_reasons')
+        if (value = attributes[:'regulatory_evidence_reasons']).is_a?(Array)
+          self.regulatory_evidence_reasons = value
+        end
+      end
+
+      if attributes.key?(:'n_fda_ivd_510k')
+        self.n_fda_ivd_510k = attributes[:'n_fda_ivd_510k']
+      end
+
+      if attributes.key?(:'n_fda_ivd_pma')
+        self.n_fda_ivd_pma = attributes[:'n_fda_ivd_pma']
+      end
+
+      if attributes.key?(:'fda_company_match_rung')
+        self.fda_company_match_rung = attributes[:'fda_company_match_rung']
+      end
+
+      if attributes.key?(:'n_fda_analyte_510k')
+        self.n_fda_analyte_510k = attributes[:'n_fda_analyte_510k']
+      end
+
+      if attributes.key?(:'n_fda_analyte_pma')
+        self.n_fda_analyte_pma = attributes[:'n_fda_analyte_pma']
+      end
+
+      if attributes.key?(:'fda_analyte_product_codes')
+        if (value = attributes[:'fda_analyte_product_codes']).is_a?(Array)
+          self.fda_analyte_product_codes = value
+        end
+      end
+
+      if attributes.key?(:'fda_analyte_fda_url')
+        self.fda_analyte_fda_url = attributes[:'fda_analyte_fda_url']
+      end
+
+      if attributes.key?(:'specific_assay_matched')
+        self.specific_assay_matched = attributes[:'specific_assay_matched']
+      end
+
+      if attributes.key?(:'specific_assay_device_name')
+        self.specific_assay_device_name = attributes[:'specific_assay_device_name']
+      end
+
+      if attributes.key?(:'specific_assay_k_number')
+        self.specific_assay_k_number = attributes[:'specific_assay_k_number']
+      end
+
+      if attributes.key?(:'specific_assay_pma_number')
+        self.specific_assay_pma_number = attributes[:'specific_assay_pma_number']
+      end
+
+      if attributes.key?(:'specific_assay_fda_url')
+        self.specific_assay_fda_url = attributes[:'specific_assay_fda_url']
+      end
+
+      if attributes.key?(:'specific_assay_similarity')
+        self.specific_assay_similarity = attributes[:'specific_assay_similarity']
+      end
+
+      if attributes.key?(:'n_cdx_entries')
+        self.n_cdx_entries = attributes[:'n_cdx_entries']
+      end
+
+      if attributes.key?(:'cdx_diagnostic_names')
+        if (value = attributes[:'cdx_diagnostic_names']).is_a?(Array)
+          self.cdx_diagnostic_names = value
+        end
       end
 
-      if attributes.key?(:'assay_provider_class_source')
-        self.assay_provider_class_source = attributes[:'assay_provider_class_source']
+      if attributes.key?(:'n_clia_certificates')
+        self.n_clia_certificates = attributes[:'n_clia_certificates']
       end
 
-      if attributes.key?(:'assay_provider_class_decided_at')
-        self.assay_provider_class_decided_at = attributes[:'assay_provider_class_decided_at']
+      if attributes.key?(:'clia_match_rung')
+        self.clia_match_rung = attributes[:'clia_match_rung']
       end
     end
 
@@ -419,9 +595,26 @@ module PharmaObservatory
           most_recent_pmid == o.most_recent_pmid &&
           most_recent_title == o.most_recent_title &&
           meets_curated_threshold == o.meets_curated_threshold &&
-          assay_provider_class == o.assay_provider_class &&
-          assay_provider_class_source == o.assay_provider_class_source &&
-          assay_provider_class_decided_at == o.assay_provider_class_decided_at
+          regulatory_evidence_kind == o.regulatory_evidence_kind &&
+          has_fda_record_for_biomarker == o.has_fda_record_for_biomarker &&
+          regulatory_evidence_reasons == o.regulatory_evidence_reasons &&
+          n_fda_ivd_510k == o.n_fda_ivd_510k &&
+          n_fda_ivd_pma == o.n_fda_ivd_pma &&
+          fda_company_match_rung == o.fda_company_match_rung &&
+          n_fda_analyte_510k == o.n_fda_analyte_510k &&
+          n_fda_analyte_pma == o.n_fda_analyte_pma &&
+          fda_analyte_product_codes == o.fda_analyte_product_codes &&
+          fda_analyte_fda_url == o.fda_analyte_fda_url &&
+          specific_assay_matched == o.specific_assay_matched &&
+          specific_assay_device_name == o.specific_assay_device_name &&
+          specific_assay_k_number == o.specific_assay_k_number &&
+          specific_assay_pma_number == o.specific_assay_pma_number &&
+          specific_assay_fda_url == o.specific_assay_fda_url &&
+          specific_assay_similarity == o.specific_assay_similarity &&
+          n_cdx_entries == o.n_cdx_entries &&
+          cdx_diagnostic_names == o.cdx_diagnostic_names &&
+          n_clia_certificates == o.n_clia_certificates &&
+          clia_match_rung == o.clia_match_rung
     end
 
     # @see the `==` method
@@ -433,7 +626,7 @@ module PharmaObservatory
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [route_key, biomarker_key, biomarker_id, biomarker_display_name, gene_resolution_status, provider_key, provider_role, provider_name, provider_org_id, provider_org_match_tier, provider_parent_org_id, provider_company_id, provider_company_name, provider_group_id, provider_group_name, rx_matched, rx_provider_id, rx_provider_name, rx_provider_slug, has_clinical_validation, has_analytical_validation, n_papers, n_dated_papers, n_undated_papers, most_recent_published_at, most_recent_pmid, most_recent_title, meets_curated_threshold, assay_provider_class, assay_provider_class_source, assay_provider_class_decided_at].hash
+      [route_key, biomarker_key, biomarker_id, biomarker_display_name, gene_resolution_status, provider_key, provider_role, provider_name, provider_org_id, provider_org_match_tier, provider_parent_org_id, provider_company_id, provider_company_name, provider_group_id, provider_group_name, rx_matched, rx_provider_id, rx_provider_name, rx_provider_slug, has_clinical_validation, has_analytical_validation, n_papers, n_dated_papers, n_undated_papers, most_recent_published_at, most_recent_pmid, most_recent_title, meets_curated_threshold, regulatory_evidence_kind, has_fda_record_for_biomarker, regulatory_evidence_reasons, n_fda_ivd_510k, n_fda_ivd_pma, fda_company_match_rung, n_fda_analyte_510k, n_fda_analyte_pma, fda_analyte_product_codes, fda_analyte_fda_url, specific_assay_matched, specific_assay_device_name, specific_assay_k_number, specific_assay_pma_number, specific_assay_fda_url, specific_assay_similarity, n_cdx_entries, cdx_diagnostic_names, n_clia_certificates, clia_match_rung].hash
     end
 
     # Builds the object from hash

data/lib/pharmaobservatory/models/biomarkers_row.rb

@@ -94,8 +94,8 @@ module PharmaObservatory
     # Assay-provider suppliers named.
     attr_accessor :n_assay_provider_suppliers
 
-    # Of those, diagnostic providers.
-    attr_accessor :n_diagnostic_provider_suppliers
+    # Of those, providers with an FDA record found for the biomarker (a companion diagnostic, a cleared or approved device the paper names, a cleared or approved IVD under the analyte's product code, or a CLIA-certified lab that ran the test). US only; no record found is not a statement about validation. Null when no assay provider is named for the biomarker.
+    attr_accessor :n_fda_evidence_providers
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
@@ -126,7 +126,7 @@ module PharmaObservatory
         :'has_analytical_validation_evidence' => :'has_analytical_validation_evidence',
         :'n_assay_provider_papers' => :'n_assay_provider_papers',
         :'n_assay_provider_suppliers' => :'n_assay_provider_suppliers',
-        :'n_diagnostic_provider_suppliers' => :'n_diagnostic_provider_suppliers'
+        :'n_fda_evidence_providers' => :'n_fda_evidence_providers'
       }
     end
 
@@ -169,7 +169,7 @@ module PharmaObservatory
         :'has_analytical_validation_evidence' => :'Boolean',
         :'n_assay_provider_papers' => :'Integer',
         :'n_assay_provider_suppliers' => :'Integer',
-        :'n_diagnostic_provider_suppliers' => :'Integer'
+        :'n_fda_evidence_providers' => :'Integer'
       }
     end
 
@@ -202,7 +202,7 @@ module PharmaObservatory
         :'has_analytical_validation_evidence',
         :'n_assay_provider_papers',
         :'n_assay_provider_suppliers',
-        :'n_diagnostic_provider_suppliers'
+        :'n_fda_evidence_providers'
       ])
     end
 
@@ -326,8 +326,8 @@ module PharmaObservatory
         self.n_assay_provider_suppliers = attributes[:'n_assay_provider_suppliers']
       end
 
-      if attributes.key?(:'n_diagnostic_provider_suppliers')
-        self.n_diagnostic_provider_suppliers = attributes[:'n_diagnostic_provider_suppliers']
+      if attributes.key?(:'n_fda_evidence_providers')
+        self.n_fda_evidence_providers = attributes[:'n_fda_evidence_providers']
       end
     end
 
@@ -377,7 +377,7 @@ module PharmaObservatory
           has_analytical_validation_evidence == o.has_analytical_validation_evidence &&
           n_assay_provider_papers == o.n_assay_provider_papers &&
           n_assay_provider_suppliers == o.n_assay_provider_suppliers &&
-          n_diagnostic_provider_suppliers == o.n_diagnostic_provider_suppliers
+          n_fda_evidence_providers == o.n_fda_evidence_providers
     end
 
     # @see the `==` method
@@ -389,7 +389,7 @@ module PharmaObservatory
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [biomarker_id, route_key, biomarker_kind, identity_status, display_name, parent_biomarker_id, gene_symbol, amino_acid_change, target_id, hgnc_id, uniprot_accession, target_protein_name, feature_code, feature_type, evidence_tier, evidence_tier_label, n_fda_cdx_assertions, n_fda_bqp_assertions, n_cancer_actionable_cgi, n_ot_association, n_trial_mention, n_publication_variant_mentions, has_clinical_validation_evidence, has_analytical_validation_evidence, n_assay_provider_papers, n_assay_provider_suppliers, n_diagnostic_provider_suppliers].hash
+      [biomarker_id, route_key, biomarker_kind, identity_status, display_name, parent_biomarker_id, gene_symbol, amino_acid_change, target_id, hgnc_id, uniprot_accession, target_protein_name, feature_code, feature_type, evidence_tier, evidence_tier_label, n_fda_cdx_assertions, n_fda_bqp_assertions, n_cancer_actionable_cgi, n_ot_association, n_trial_mention, n_publication_variant_mentions, has_clinical_validation_evidence, has_analytical_validation_evidence, n_assay_provider_papers, n_assay_provider_suppliers, n_fda_evidence_providers].hash
     end
 
     # Builds the object from hash

data/lib/pharmaobservatory/models/companies_row.rb

@@ -22,7 +22,7 @@ module PharmaObservatory
     # The company's display name: its own legal entity's name where one is known.
     attr_accessor :company_name
 
-    # Which source supplied the name: gleif_legal_name, edgar_registrant, ror or sponsor_display_name.
+    # Which source supplied the name: gleif_legal_name, edgar_registrant, ror, edgar_current_name or sponsor_display_name.
     attr_accessor :name_basis
 
     # Country of the company's own legal entity, as the source states it.

data/lib/pharmaobservatory/models/company_assets_row.rb

@@ -55,6 +55,12 @@ module PharmaObservatory
     # True when the drug has been withdrawn from the market.
     attr_accessor :withdrawn
 
+    # True when the sponsor is judged to develop the drug (an experimental arm, a regulatory holder, or an inferred lead); false when it is the backbone or comparator of a combination, one of many leads of a crowded drug, or not the holder of a generic. Every row is kept; this column labels it.
+    attr_accessor :owned
+
+    # Why owned is what it is: experimental_arm, regulatory_holder or inferred_lead (owned), or backbone, comparator, crowded_not_lead or generic_not_holder (not owned). inferred_lead is an inference made where the trials give no arm evidence either way.
+    attr_accessor :ownership_basis
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -70,7 +76,9 @@ module PharmaObservatory
         :'n_trials' => :'n_trials',
         :'n_active' => :'n_active',
         :'last_year' => :'last_year',
-        :'withdrawn' => :'withdrawn'
+        :'withdrawn' => :'withdrawn',
+        :'owned' => :'owned',
+        :'ownership_basis' => :'ownership_basis'
       }
     end
 
@@ -99,7 +107,9 @@ module PharmaObservatory
         :'n_trials' => :'Integer',
         :'n_active' => :'Integer',
         :'last_year' => :'Integer',
-        :'withdrawn' => :'Boolean'
+        :'withdrawn' => :'Boolean',
+        :'owned' => :'Boolean',
+        :'ownership_basis' => :'String'
       }
     end
 
@@ -118,7 +128,9 @@ module PharmaObservatory
         :'n_trials',
         :'n_active',
         :'last_year',
-        :'withdrawn'
+        :'withdrawn',
+        :'owned',
+        :'ownership_basis'
       ])
     end
 
@@ -189,6 +201,14 @@ module PharmaObservatory
       if attributes.key?(:'withdrawn')
         self.withdrawn = attributes[:'withdrawn']
       end
+
+      if attributes.key?(:'owned')
+        self.owned = attributes[:'owned']
+      end
+
+      if attributes.key?(:'ownership_basis')
+        self.ownership_basis = attributes[:'ownership_basis']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -223,7 +243,9 @@ module PharmaObservatory
           n_trials == o.n_trials &&
           n_active == o.n_active &&
           last_year == o.last_year &&
-          withdrawn == o.withdrawn
+          withdrawn == o.withdrawn &&
+          owned == o.owned &&
+          ownership_basis == o.ownership_basis
     end
 
     # @see the `==` method
@@ -235,7 +257,7 @@ module PharmaObservatory
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [sponsor_org_id, sponsor_name, sponsor_company_id, sponsor_company_name, sponsor_group_id, sponsor_group_name, drug_id, drug_name, max_phase, n_trials, n_active, last_year, withdrawn].hash
+      [sponsor_org_id, sponsor_name, sponsor_company_id, sponsor_company_name, sponsor_group_id, sponsor_group_name, drug_id, drug_name, max_phase, n_trials, n_active, last_year, withdrawn, owned, ownership_basis].hash
     end
 
     # Builds the object from hash

data/lib/pharmaobservatory/models/company_competitors_row.rb

@@ -14,7 +14,7 @@ require 'date'
 require 'time'
 
 module PharmaObservatory
-  # One row of the company_competitors dataset: one row per ordered company pair: a company and one of its top 25 competitors. A grouped request returns the group columns and the measures instead, as additional properties.
+  # One row of the company_competitors dataset: one row per ordered company pair: a company and one of the top 25 companies of each competitor_class by program overlap. A grouped request returns the group columns and the measures instead, as additional properties.
   class CompanyCompetitorsRow
     # Company level: the company the row is about; the entry key for the companies object type.
     attr_accessor :company_id
@@ -40,7 +40,13 @@ module PharmaObservatory
     # Display name of the competitor's group.
     attr_accessor :competitor_group_name
 
-    # The competitor's rank for the company by competitor_score (1 is the highest).
+    # The competitor's class: industry, or non_industry (not classed as industry by the sponsor-class rule: academic, hospital, government, nonprofit, and any record the rule does not reach). competitor_rank restarts at 1 within each class, so filter or sort on this column first.
+    attr_accessor :competitor_class
+
+    # How many companies of this competitor_class were candidates (a shared target, or an indication overlap above the similarity floor) before the top 25 were kept. The same value on every row of one company and class.
+    attr_accessor :n_class_candidates
+
+    # The competitor's rank within its competitor_class for the company by competitor_score (1 is the highest).
     attr_accessor :competitor_rank
 
     # 100 times the weighted mean of the four similarities below, rounded to four places.
@@ -102,6 +108,8 @@ module PharmaObservatory
         :'competitor_company_name' => :'competitor_company_name',
         :'competitor_group_id' => :'competitor_group_id',
         :'competitor_group_name' => :'competitor_group_name',
+        :'competitor_class' => :'competitor_class',
+        :'n_class_candidates' => :'n_class_candidates',
         :'competitor_rank' => :'competitor_rank',
         :'competitor_score' => :'competitor_score',
         :'target_sim' => :'target_sim',
@@ -143,6 +151,8 @@ module PharmaObservatory
         :'competitor_company_name' => :'String',
         :'competitor_group_id' => :'String',
         :'competitor_group_name' => :'String',
+        :'competitor_class' => :'String',
+        :'n_class_candidates' => :'Integer',
         :'competitor_rank' => :'Integer',
         :'competitor_score' => :'Float',
         :'target_sim' => :'Float',
@@ -174,6 +184,8 @@ module PharmaObservatory
         :'competitor_company_name',
         :'competitor_group_id',
         :'competitor_group_name',
+        :'competitor_class',
+        :'n_class_candidates',
         :'competitor_rank',
         :'competitor_score',
         :'target_sim',
@@ -242,6 +254,14 @@ module PharmaObservatory
         self.competitor_group_name = attributes[:'competitor_group_name']
       end
 
+      if attributes.key?(:'competitor_class')
+        self.competitor_class = attributes[:'competitor_class']
+      end
+
+      if attributes.key?(:'n_class_candidates')
+        self.n_class_candidates = attributes[:'n_class_candidates']
+      end
+
       if attributes.key?(:'competitor_rank')
         self.competitor_rank = attributes[:'competitor_rank']
       end
@@ -345,6 +365,8 @@ module PharmaObservatory
           competitor_company_name == o.competitor_company_name &&
           competitor_group_id == o.competitor_group_id &&
           competitor_group_name == o.competitor_group_name &&
+          competitor_class == o.competitor_class &&
+          n_class_candidates == o.n_class_candidates &&
           competitor_rank == o.competitor_rank &&
           competitor_score == o.competitor_score &&
           target_sim == o.target_sim &&
@@ -373,7 +395,7 @@ module PharmaObservatory
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [company_id, company_name, group_id, group_name, competitor_company_id, competitor_company_name, competitor_group_id, competitor_group_name, competitor_rank, competitor_score, target_sim, mechanism_sim, indication_sim, phase_sim, n_shared_targets, n_shared_mechanisms, n_shared_indications, n_phase_overlap_targets, n_company_targets, n_competitor_targets, n_company_indications, n_competitor_indications, top_shared_targets, top_shared_indications, top_shared_mechanisms].hash
+      [company_id, company_name, group_id, group_name, competitor_company_id, competitor_company_name, competitor_group_id, competitor_group_name, competitor_class, n_class_candidates, competitor_rank, competitor_score, target_sim, mechanism_sim, indication_sim, phase_sim, n_shared_targets, n_shared_mechanisms, n_shared_indications, n_phase_overlap_targets, n_company_targets, n_competitor_targets, n_company_indications, n_competitor_indications, top_shared_targets, top_shared_indications, top_shared_mechanisms].hash
     end
 
     # Builds the object from hash

data/lib/pharmaobservatory/models/company_programs_row.rb

@@ -64,6 +64,12 @@ module PharmaObservatory
     # approved, active or abandoned.
     attr_accessor :lifecycle
 
+    # True when the sponsor is judged to develop the drug (an experimental arm, a regulatory holder, or an inferred lead); false when it is the backbone or comparator of a combination, one of many leads of a crowded drug, or not the holder of a generic. Every row is kept; this column labels it.
+    attr_accessor :owned
+
+    # Why owned is what it is: experimental_arm, regulatory_holder or inferred_lead (owned), or backbone, comparator, crowded_not_lead or generic_not_holder (not owned). inferred_lead is an inference made where the trials give no arm evidence either way.
+    attr_accessor :ownership_basis
+
     # Disability-adjusted life years (DALYs, millions) of the condition's global burden, from the Global Burden of Disease (GBD) 2021 study of the Institute for Health Metrics and Evaluation (IHME). Null for a caller without the licence for this column; see withheld_columns.
     attr_accessor :dalys_millions
 
@@ -86,6 +92,8 @@ module PharmaObservatory
         :'last_year' => :'last_year',
         :'withdrawn' => :'withdrawn',
         :'lifecycle' => :'lifecycle',
+        :'owned' => :'owned',
+        :'ownership_basis' => :'ownership_basis',
         :'dalys_millions' => :'dalys_millions'
       }
     end
@@ -119,6 +127,8 @@ module PharmaObservatory
         :'last_year' => :'Integer',
         :'withdrawn' => :'Boolean',
         :'lifecycle' => :'String',
+        :'owned' => :'Boolean',
+        :'ownership_basis' => :'String',
         :'dalys_millions' => :'Float'
       }
     end
@@ -142,6 +152,8 @@ module PharmaObservatory
         :'last_year',
         :'withdrawn',
         :'lifecycle',
+        :'owned',
+        :'ownership_basis',
         :'dalys_millions'
       ])
     end
@@ -226,6 +238,14 @@ module PharmaObservatory
         self.lifecycle = attributes[:'lifecycle']
       end
 
+      if attributes.key?(:'owned')
+        self.owned = attributes[:'owned']
+      end
+
+      if attributes.key?(:'ownership_basis')
+        self.ownership_basis = attributes[:'ownership_basis']
+      end
+
       if attributes.key?(:'dalys_millions')
         self.dalys_millions = attributes[:'dalys_millions']
       end
@@ -267,6 +287,8 @@ module PharmaObservatory
           last_year == o.last_year &&
           withdrawn == o.withdrawn &&
           lifecycle == o.lifecycle &&
+          owned == o.owned &&
+          ownership_basis == o.ownership_basis &&
           dalys_millions == o.dalys_millions
     end
 
@@ -279,7 +301,7 @@ module PharmaObservatory
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [sponsor_org_id, sponsor_name, sponsor_company_id, sponsor_company_name, sponsor_group_id, sponsor_group_name, drug_id, drug_name, condition_id, condition_name, max_phase, n_trials, n_active, last_year, withdrawn, lifecycle, dalys_millions].hash
+      [sponsor_org_id, sponsor_name, sponsor_company_id, sponsor_company_name, sponsor_group_id, sponsor_group_name, drug_id, drug_name, condition_id, condition_name, max_phase, n_trials, n_active, last_year, withdrawn, lifecycle, owned, ownership_basis, dalys_millions].hash
     end
 
     # Builds the object from hash