pharmaobservatory 0.1.4 → 0.1.6

data/lib/pharmaobservatory/models/biomarker_publishing_companies_row.rb

@@ -58,6 +58,18 @@ module PharmaObservatory
     # Papers left out because they name too many organizations.
     attr_accessor :n_papers_excluded_as_consortium
 
+    # Articles in the trial-cited publication set the publishing counts are drawn from (not all of PubMed). Corpus-wide, the same value on every row, never per biomarker or per company.
+    attr_accessor :corpus_articles
+
+    # Distinct author affiliation strings in the corpus. Corpus-wide, the same value on every row.
+    attr_accessor :n_affiliations
+
+    # Affiliation strings that resolved to an organization. Corpus-wide, the same value on every row.
+    attr_accessor :n_resolved_affiliations
+
+    # n_resolved_affiliations divided by n_affiliations, rounded to four places. Corpus-wide, the same value on every row: how much of the corpus the company attribution can see, not a figure about this biomarker.
+    attr_accessor :affiliation_resolved_share
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -74,7 +86,11 @@ module PharmaObservatory
         :'last_pub_year' => :'last_pub_year',
         :'supporting_pmids' => :'supporting_pmids',
         :'supporting_pmids_truncated' => :'supporting_pmids_truncated',
-        :'n_papers_excluded_as_consortium' => :'n_papers_excluded_as_consortium'
+        :'n_papers_excluded_as_consortium' => :'n_papers_excluded_as_consortium',
+        :'corpus_articles' => :'corpus_articles',
+        :'n_affiliations' => :'n_affiliations',
+        :'n_resolved_affiliations' => :'n_resolved_affiliations',
+        :'affiliation_resolved_share' => :'affiliation_resolved_share'
       }
     end
 
@@ -104,7 +120,11 @@ module PharmaObservatory
         :'last_pub_year' => :'Integer',
         :'supporting_pmids' => :'Array<String>',
         :'supporting_pmids_truncated' => :'Boolean',
-        :'n_papers_excluded_as_consortium' => :'Integer'
+        :'n_papers_excluded_as_consortium' => :'Integer',
+        :'corpus_articles' => :'Integer',
+        :'n_affiliations' => :'Integer',
+        :'n_resolved_affiliations' => :'Integer',
+        :'affiliation_resolved_share' => :'Float'
       }
     end
 
@@ -124,7 +144,11 @@ module PharmaObservatory
         :'last_pub_year',
         :'supporting_pmids',
         :'supporting_pmids_truncated',
-        :'n_papers_excluded_as_consortium'
+        :'n_papers_excluded_as_consortium',
+        :'corpus_articles',
+        :'n_affiliations',
+        :'n_resolved_affiliations',
+        :'affiliation_resolved_share'
       ])
     end
 
@@ -201,6 +225,22 @@ module PharmaObservatory
       if attributes.key?(:'n_papers_excluded_as_consortium')
         self.n_papers_excluded_as_consortium = attributes[:'n_papers_excluded_as_consortium']
       end
+
+      if attributes.key?(:'corpus_articles')
+        self.corpus_articles = attributes[:'corpus_articles']
+      end
+
+      if attributes.key?(:'n_affiliations')
+        self.n_affiliations = attributes[:'n_affiliations']
+      end
+
+      if attributes.key?(:'n_resolved_affiliations')
+        self.n_resolved_affiliations = attributes[:'n_resolved_affiliations']
+      end
+
+      if attributes.key?(:'affiliation_resolved_share')
+        self.affiliation_resolved_share = attributes[:'affiliation_resolved_share']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -236,7 +276,11 @@ module PharmaObservatory
           last_pub_year == o.last_pub_year &&
           supporting_pmids == o.supporting_pmids &&
           supporting_pmids_truncated == o.supporting_pmids_truncated &&
-          n_papers_excluded_as_consortium == o.n_papers_excluded_as_consortium
+          n_papers_excluded_as_consortium == o.n_papers_excluded_as_consortium &&
+          corpus_articles == o.corpus_articles &&
+          n_affiliations == o.n_affiliations &&
+          n_resolved_affiliations == o.n_resolved_affiliations &&
+          affiliation_resolved_share == o.affiliation_resolved_share
     end
 
     # @see the `==` method
@@ -248,7 +292,7 @@ module PharmaObservatory
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [route_key, gene_symbol, publisher_company_id, publisher_company_name, publisher_group_id, publisher_group_name, n_publications, n_member_orgs, best_match_tier, first_pub_year, last_pub_year, supporting_pmids, supporting_pmids_truncated, n_papers_excluded_as_consortium].hash
+      [route_key, gene_symbol, publisher_company_id, publisher_company_name, publisher_group_id, publisher_group_name, n_publications, n_member_orgs, best_match_tier, first_pub_year, last_pub_year, supporting_pmids, supporting_pmids_truncated, n_papers_excluded_as_consortium, corpus_articles, n_affiliations, n_resolved_affiliations, affiliation_resolved_share].hash
     end
 
     # Builds the object from hash

data/lib/pharmaobservatory/models/biomarker_relations_response.rb

@@ -102,7 +102,7 @@ module PharmaObservatory
         :'grain' => :'String',
         :'object_type' => :'String',
         :'id' => :'String',
-        :'scope' => :'BiomarkerCdxAssertionsResponseScope',
+        :'scope' => :'BiomarkerAssayEvidenceResponseScope',
         :'columns' => :'Array<DatasetColumn>',
         :'rows' => :'Array<BiomarkerRelationsRow>',
         :'total' => :'Integer',
@@ -115,8 +115,8 @@ module PharmaObservatory
         :'source_credit' => :'String',
         :'withheld_tiers' => :'Array<String>',
         :'withheld_columns' => :'Array<String>',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/biomarker_sample_coverage_response.rb

@@ -102,7 +102,7 @@ module PharmaObservatory
         :'grain' => :'String',
         :'object_type' => :'String',
         :'id' => :'String',
-        :'scope' => :'BiomarkerCdxAssertionsResponseScope',
+        :'scope' => :'BiomarkerAssayEvidenceResponseScope',
         :'columns' => :'Array<DatasetColumn>',
         :'rows' => :'Array<BiomarkerSampleCoverageRow>',
         :'total' => :'Integer',
@@ -115,8 +115,8 @@ module PharmaObservatory
         :'source_credit' => :'String',
         :'withheld_tiers' => :'Array<String>',
         :'withheld_columns' => :'Array<String>',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/biomarker_sample_prevalence_response.rb

@@ -102,7 +102,7 @@ module PharmaObservatory
         :'grain' => :'String',
         :'object_type' => :'String',
         :'id' => :'String',
-        :'scope' => :'BiomarkerCdxAssertionsResponseScope',
+        :'scope' => :'BiomarkerAssayEvidenceResponseScope',
         :'columns' => :'Array<DatasetColumn>',
         :'rows' => :'Array<BiomarkerSamplePrevalenceRow>',
         :'total' => :'Integer',
@@ -115,8 +115,8 @@ module PharmaObservatory
         :'source_credit' => :'String',
         :'withheld_tiers' => :'Array<String>',
         :'withheld_columns' => :'Array<String>',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/biomarker_validation_response.rb

@@ -102,7 +102,7 @@ module PharmaObservatory
         :'grain' => :'String',
         :'object_type' => :'String',
         :'id' => :'String',
-        :'scope' => :'BiomarkerCdxAssertionsResponseScope',
+        :'scope' => :'BiomarkerAssayEvidenceResponseScope',
         :'columns' => :'Array<DatasetColumn>',
         :'rows' => :'Array<BiomarkerValidationRow>',
         :'total' => :'Integer',
@@ -115,8 +115,8 @@ module PharmaObservatory
         :'source_credit' => :'String',
         :'withheld_tiers' => :'Array<String>',
         :'withheld_columns' => :'Array<String>',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/biomarker_variant_mentions_response.rb

@@ -102,7 +102,7 @@ module PharmaObservatory
         :'grain' => :'String',
         :'object_type' => :'String',
         :'id' => :'String',
-        :'scope' => :'BiomarkerCdxAssertionsResponseScope',
+        :'scope' => :'BiomarkerAssayEvidenceResponseScope',
         :'columns' => :'Array<DatasetColumn>',
         :'rows' => :'Array<BiomarkerVariantMentionsRow>',
         :'total' => :'Integer',
@@ -115,8 +115,8 @@ module PharmaObservatory
         :'source_credit' => :'String',
         :'withheld_tiers' => :'Array<String>',
         :'withheld_columns' => :'Array<String>',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/biomarkers_record.rb

@@ -74,8 +74,8 @@ module PharmaObservatory
         :'datasets' => :'Array<DatasetListing>',
         :'attribution' => :'Array<DatasetAttribution>',
         :'source_credit' => :'String',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/biomarkers_response.rb

@@ -102,7 +102,7 @@ module PharmaObservatory
         :'grain' => :'String',
         :'object_type' => :'String',
         :'id' => :'String',
-        :'scope' => :'BiomarkerCdxAssertionsResponseScope',
+        :'scope' => :'BiomarkerAssayEvidenceResponseScope',
         :'columns' => :'Array<DatasetColumn>',
         :'rows' => :'Array<BiomarkersRow>',
         :'total' => :'Integer',
@@ -115,8 +115,8 @@ module PharmaObservatory
         :'source_credit' => :'String',
         :'withheld_tiers' => :'Array<String>',
         :'withheld_columns' => :'Array<String>',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/biomarkers_row.rb

@@ -49,6 +49,9 @@ module PharmaObservatory
     # The UniProt accession.
     attr_accessor :uniprot_accession
 
+    # The recommended name of the protein the biomarker's gene encodes: the UniProt protein of the accession, else the first UniProt protein of the gene symbol, else the Open Targets target name. Null when none names it.
+    attr_accessor :target_protein_name
+
     # Feature code for a non-gene feature.
     attr_accessor :feature_code
 
@@ -108,6 +111,7 @@ module PharmaObservatory
         :'target_id' => :'target_id',
         :'hgnc_id' => :'hgnc_id',
         :'uniprot_accession' => :'uniprot_accession',
+        :'target_protein_name' => :'target_protein_name',
         :'feature_code' => :'feature_code',
         :'feature_type' => :'feature_type',
         :'evidence_tier' => :'evidence_tier',
@@ -150,6 +154,7 @@ module PharmaObservatory
         :'target_id' => :'String',
         :'hgnc_id' => :'String',
         :'uniprot_accession' => :'String',
+        :'target_protein_name' => :'String',
         :'feature_code' => :'String',
         :'feature_type' => :'String',
         :'evidence_tier' => :'Integer',
@@ -182,6 +187,7 @@ module PharmaObservatory
         :'target_id',
         :'hgnc_id',
         :'uniprot_accession',
+        :'target_protein_name',
         :'feature_code',
         :'feature_type',
         :'evidence_tier',
@@ -260,6 +266,10 @@ module PharmaObservatory
         self.uniprot_accession = attributes[:'uniprot_accession']
       end
 
+      if attributes.key?(:'target_protein_name')
+        self.target_protein_name = attributes[:'target_protein_name']
+      end
+
       if attributes.key?(:'feature_code')
         self.feature_code = attributes[:'feature_code']
       end
@@ -352,6 +362,7 @@ module PharmaObservatory
           target_id == o.target_id &&
           hgnc_id == o.hgnc_id &&
           uniprot_accession == o.uniprot_accession &&
+          target_protein_name == o.target_protein_name &&
           feature_code == o.feature_code &&
           feature_type == o.feature_type &&
           evidence_tier == o.evidence_tier &&
@@ -378,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, 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_diagnostic_provider_suppliers].hash
     end
 
     # Builds the object from hash

data/lib/pharmaobservatory/models/cell_lines_record.rb

@@ -74,8 +74,8 @@ module PharmaObservatory
         :'datasets' => :'Array<DatasetListing>',
         :'attribution' => :'Array<DatasetAttribution>',
         :'source_credit' => :'String',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/cell_lines_response.rb

@@ -102,7 +102,7 @@ module PharmaObservatory
         :'grain' => :'String',
         :'object_type' => :'String',
         :'id' => :'String',
-        :'scope' => :'BiomarkerCdxAssertionsResponseScope',
+        :'scope' => :'BiomarkerAssayEvidenceResponseScope',
         :'columns' => :'Array<DatasetColumn>',
         :'rows' => :'Array<CellLinesRow>',
         :'total' => :'Integer',
@@ -115,8 +115,8 @@ module PharmaObservatory
         :'source_credit' => :'String',
         :'withheld_tiers' => :'Array<String>',
         :'withheld_columns' => :'Array<String>',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/companies_record.rb

@@ -74,8 +74,8 @@ module PharmaObservatory
         :'datasets' => :'Array<DatasetListing>',
         :'attribution' => :'Array<DatasetAttribution>',
         :'source_credit' => :'String',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/companies_response.rb

@@ -102,7 +102,7 @@ module PharmaObservatory
         :'grain' => :'String',
         :'object_type' => :'String',
         :'id' => :'String',
-        :'scope' => :'BiomarkerCdxAssertionsResponseScope',
+        :'scope' => :'BiomarkerAssayEvidenceResponseScope',
         :'columns' => :'Array<DatasetColumn>',
         :'rows' => :'Array<CompaniesRow>',
         :'total' => :'Integer',
@@ -115,8 +115,8 @@ module PharmaObservatory
         :'source_credit' => :'String',
         :'withheld_tiers' => :'Array<String>',
         :'withheld_columns' => :'Array<String>',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/companies_row.rb

@@ -28,7 +28,7 @@ module PharmaObservatory
     # Country of the company's own legal entity, as the source states it.
     attr_accessor :country
 
-    # The organization type of the company's representative record.
+    # The organization type of the company's representative record: Academic, Government, Hospital, Industry, Nonprofit or Other (from the Research Organization Registry (ROR) record or the filing), or the lowercase tags investor and manufacturer that mark a minted adviser or manufacturer record.
     attr_accessor :org_type
 
     # The roles the company's organizations play (Manufacturer, Sponsor and so on).

data/lib/pharmaobservatory/models/company_assets_response.rb

@@ -102,7 +102,7 @@ module PharmaObservatory
         :'grain' => :'String',
         :'object_type' => :'String',
         :'id' => :'String',
-        :'scope' => :'BiomarkerCdxAssertionsResponseScope',
+        :'scope' => :'BiomarkerAssayEvidenceResponseScope',
         :'columns' => :'Array<DatasetColumn>',
         :'rows' => :'Array<CompanyAssetsRow>',
         :'total' => :'Integer',
@@ -115,8 +115,8 @@ module PharmaObservatory
         :'source_credit' => :'String',
         :'withheld_tiers' => :'Array<String>',
         :'withheld_columns' => :'Array<String>',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/company_funding_events_response.rb

@@ -102,7 +102,7 @@ module PharmaObservatory
         :'grain' => :'String',
         :'object_type' => :'String',
         :'id' => :'String',
-        :'scope' => :'BiomarkerCdxAssertionsResponseScope',
+        :'scope' => :'BiomarkerAssayEvidenceResponseScope',
         :'columns' => :'Array<DatasetColumn>',
         :'rows' => :'Array<CompanyFundingEventsRow>',
         :'total' => :'Integer',
@@ -115,8 +115,8 @@ module PharmaObservatory
         :'source_credit' => :'String',
         :'withheld_tiers' => :'Array<String>',
         :'withheld_columns' => :'Array<String>',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/company_funding_events_row.rb

@@ -40,7 +40,7 @@ module PharmaObservatory
     # The date the source gives for the event; event_stage says what the date means.
     attr_accessor :event_date
 
-    # The NIH fiscal year, for a grant; null for the other sources.
+    # The fiscal year of the US National Institutes of Health (NIH), for a grant; null for the other sources.
     attr_accessor :fiscal_year
 
     # The source lane: reporter (NIH RePORTER grants), form_d (SEC Form D Regulation D offerings), edgar_offerings (SEC registered offerings) or sec_extracted (financings extracted from SEC filings).

data/lib/pharmaobservatory/models/company_funding_summary_response.rb

@@ -102,7 +102,7 @@ module PharmaObservatory
         :'grain' => :'String',
         :'object_type' => :'String',
         :'id' => :'String',
-        :'scope' => :'BiomarkerCdxAssertionsResponseScope',
+        :'scope' => :'BiomarkerAssayEvidenceResponseScope',
         :'columns' => :'Array<DatasetColumn>',
         :'rows' => :'Array<CompanyFundingSummaryRow>',
         :'total' => :'Integer',
@@ -115,8 +115,8 @@ module PharmaObservatory
         :'source_credit' => :'String',
         :'withheld_tiers' => :'Array<String>',
         :'withheld_columns' => :'Array<String>',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/company_members_response.rb

@@ -102,7 +102,7 @@ module PharmaObservatory
         :'grain' => :'String',
         :'object_type' => :'String',
         :'id' => :'String',
-        :'scope' => :'BiomarkerCdxAssertionsResponseScope',
+        :'scope' => :'BiomarkerAssayEvidenceResponseScope',
         :'columns' => :'Array<DatasetColumn>',
         :'rows' => :'Array<CompanyMembersRow>',
         :'total' => :'Integer',
@@ -115,8 +115,8 @@ module PharmaObservatory
         :'source_credit' => :'String',
         :'withheld_tiers' => :'Array<String>',
         :'withheld_columns' => :'Array<String>',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/company_programs_response.rb

@@ -102,7 +102,7 @@ module PharmaObservatory
         :'grain' => :'String',
         :'object_type' => :'String',
         :'id' => :'String',
-        :'scope' => :'BiomarkerCdxAssertionsResponseScope',
+        :'scope' => :'BiomarkerAssayEvidenceResponseScope',
         :'columns' => :'Array<DatasetColumn>',
         :'rows' => :'Array<CompanyProgramsRow>',
         :'total' => :'Integer',
@@ -115,8 +115,8 @@ module PharmaObservatory
         :'source_credit' => :'String',
         :'withheld_tiers' => :'Array<String>',
         :'withheld_columns' => :'Array<String>',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/company_targets_response.rb

@@ -102,7 +102,7 @@ module PharmaObservatory
         :'grain' => :'String',
         :'object_type' => :'String',
         :'id' => :'String',
-        :'scope' => :'BiomarkerCdxAssertionsResponseScope',
+        :'scope' => :'BiomarkerAssayEvidenceResponseScope',
         :'columns' => :'Array<DatasetColumn>',
         :'rows' => :'Array<CompanyTargetsRow>',
         :'total' => :'Integer',
@@ -115,8 +115,8 @@ module PharmaObservatory
         :'source_credit' => :'String',
         :'withheld_tiers' => :'Array<String>',
         :'withheld_columns' => :'Array<String>',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/company_targets_row.rb

@@ -49,6 +49,12 @@ module PharmaObservatory
     # Distinct trials the company leads in those programs.
     attr_accessor :n_trials
 
+    # Distinct drug and indication programs (a specific indication with at least two trials) the company leads against the target.
+    attr_accessor :n_programs
+
+    # The latest start year among the company's trials against the target in those programs.
+    attr_accessor :last_year
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -62,7 +68,9 @@ module PharmaObservatory
         :'max_phase' => :'max_phase',
         :'n_drugs' => :'n_drugs',
         :'n_conditions' => :'n_conditions',
-        :'n_trials' => :'n_trials'
+        :'n_trials' => :'n_trials',
+        :'n_programs' => :'n_programs',
+        :'last_year' => :'last_year'
       }
     end
 
@@ -89,7 +97,9 @@ module PharmaObservatory
         :'max_phase' => :'Integer',
         :'n_drugs' => :'Integer',
         :'n_conditions' => :'Integer',
-        :'n_trials' => :'Integer'
+        :'n_trials' => :'Integer',
+        :'n_programs' => :'Integer',
+        :'last_year' => :'Integer'
       }
     end
 
@@ -106,7 +116,9 @@ module PharmaObservatory
         :'max_phase',
         :'n_drugs',
         :'n_conditions',
-        :'n_trials'
+        :'n_trials',
+        :'n_programs',
+        :'last_year'
       ])
     end
 
@@ -169,6 +181,14 @@ module PharmaObservatory
       if attributes.key?(:'n_trials')
         self.n_trials = attributes[:'n_trials']
       end
+
+      if attributes.key?(:'n_programs')
+        self.n_programs = attributes[:'n_programs']
+      end
+
+      if attributes.key?(:'last_year')
+        self.last_year = attributes[:'last_year']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -201,7 +221,9 @@ module PharmaObservatory
           max_phase == o.max_phase &&
           n_drugs == o.n_drugs &&
           n_conditions == o.n_conditions &&
-          n_trials == o.n_trials
+          n_trials == o.n_trials &&
+          n_programs == o.n_programs &&
+          last_year == o.last_year
     end
 
     # @see the `==` method
@@ -213,7 +235,7 @@ module PharmaObservatory
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [sponsor_company_id, sponsor_company_name, sponsor_group_id, sponsor_group_name, target_id, target_symbol, target_name, max_phase, n_drugs, n_conditions, n_trials].hash
+      [sponsor_company_id, sponsor_company_name, sponsor_group_id, sponsor_group_name, target_id, target_symbol, target_name, max_phase, n_drugs, n_conditions, n_trials, n_programs, last_year].hash
     end
 
     # Builds the object from hash

data/lib/pharmaobservatory/models/condition_adverse_events_response.rb

@@ -102,7 +102,7 @@ module PharmaObservatory
         :'grain' => :'String',
         :'object_type' => :'String',
         :'id' => :'String',
-        :'scope' => :'BiomarkerCdxAssertionsResponseScope',
+        :'scope' => :'BiomarkerAssayEvidenceResponseScope',
         :'columns' => :'Array<DatasetColumn>',
         :'rows' => :'Array<ConditionAdverseEventsRow>',
         :'total' => :'Integer',
@@ -115,8 +115,8 @@ module PharmaObservatory
         :'source_credit' => :'String',
         :'withheld_tiers' => :'Array<String>',
         :'withheld_columns' => :'Array<String>',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/condition_burden_response.rb

@@ -102,7 +102,7 @@ module PharmaObservatory
         :'grain' => :'String',
         :'object_type' => :'String',
         :'id' => :'String',
-        :'scope' => :'BiomarkerCdxAssertionsResponseScope',
+        :'scope' => :'BiomarkerAssayEvidenceResponseScope',
         :'columns' => :'Array<DatasetColumn>',
         :'rows' => :'Array<ConditionBurdenRow>',
         :'total' => :'Integer',
@@ -115,8 +115,8 @@ module PharmaObservatory
         :'source_credit' => :'String',
         :'withheld_tiers' => :'Array<String>',
         :'withheld_columns' => :'Array<String>',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }