viral_seq 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8be7a521e58d5335122db011b5f003407cfaab95480062337451377ee2fdfca9
-  data.tar.gz: 5c437afa58d63d0bde9dc6acf6c98904b8a7b364618fb3ebebd2cb36a44daa2c
+  metadata.gz: 4e6d55ab37ecd3b9c5688c99772fc49792a5319bac853ac768367a8b42c0e0b6
+  data.tar.gz: a69e78c80f22848facb41ad4f9d9fb64e6d4e47ff6e18afa3421d64513ce6558
 SHA512:
-  metadata.gz: 23622009f3f39961e3d2d760bdde3b9f9b831d001aca68b6eee3d44305a77d3e964c48541811fd9dddc26ad9427383716ccdc64436789b01eb11c51f762d2a6b
-  data.tar.gz: c1a1ac49930c24f61bfa0872f518fea8146e701a5a874de45e373d4d3d20eca50d138bd44f9d59ea1102d525b392dd9b6ed053647b1c25d97ad0244eb4fe15ff
+  metadata.gz: ae34ac12bd2b86d4c7fc040765b26b94d41cfe239a206b2e84bf55841988826bcfbf685e788b93224ee78e29b1280454059991d644f81cbf24f1b97fff3f2294
+  data.tar.gz: 254993ea2126ca51d0ad5e2b6be2dca90e1b3ed817266e46b5ca46f91d2a69288c0a87c58906ef3da8ad6465e08788c850d6bc72013e30f1ead13e186ba16dfd

data/README.md

@@ -187,6 +187,13 @@ qc_seqhash.sdrm_hiv_pr(cut_off)
 
 ## Updates
 
+### Version-1.7.1-05120203
+
+  1. Add a size check for the raw sequences. If the size smaller than the input params, error messages will be sent to users. IF the actual size is greater than the input params, extra bases will be truncated. 
+  2. Now allows mismatch for the primer region sequences. Forward primer region allows 2 nt differences and cDNA primer region allows 3 nt differences.
+  3. Bug fix.  
+  4. TCS version to 2.5.2
+
 ### Version-1.7.0-08242022
 
   1. Add warnings if `tcs` pipeline is excecuting through source instead of installing from `gem`. 

data/bin/tcs

@@ -41,7 +41,7 @@ if gem_installed?('viral_seq')
   require 'viral_seq'
 else 
   printf "\n****************************************************\n"
-  printf "**** THIS PACKAGE CANNOT BE RAN FROM SOURCE ********\n"
+  printf "**** THIS PACKAGE CANNOT BE RUN FROM SOURCE ********\n"
   printf "**** PLEASE INSTALL USING `gem install viral_seq` **\n"
   printf "****************************************************\n\n"
   exit 1
@@ -104,7 +104,7 @@ end.parse!
 if options[:json_generator]
   params = ViralSeq::TcsJson.generate
 elsif options[:dr]
-  params = ViralSeq::TcsDr::PARAMS
+  params = ViralSeq::TcsDr::PARAMS  
 elsif (options[:params_json] && File.exist?(options[:params_json]))
   params = JSON.parse(File.read(options[:params_json]), symbolize_names: true)
 else
@@ -163,6 +163,24 @@ begin
     $platform_sequencing_length = 300
   end
 
+  r1_raw_size = r1_fastq_sh.dna_hash.values[0].size
+  r2_raw_size = r2_fastq_sh.dna_hash.values[0].size
+ 
+  if r1_raw_size >= $platform_sequencing_length
+    r1_size_diff = r1_raw_size - $platform_sequencing_length
+  else
+    raise StandardError.new "R1 size smaller than the input platform format #{$platform_sequencing_length} bp."
+  end
+
+  if r2_raw_size >= $platform_sequencing_length
+    r2_size_diff = r2_raw_size - $platform_sequencing_length
+  else
+    raise StandardError.new "R2 size smaller than the input platform format #{$platform_sequencing_length} bp."
+  end
+
+  r1_truncate_base_number = 2 + r1_size_diff
+  r2_truncate_base_number = 2 + r2_size_diff
+
   primers = params[:primer_pairs]
   if primers.empty? or primers.nil?
     ViralSeq::TcsCore.log_and_abort log, "No primer information. Script terminated."
@@ -235,8 +253,8 @@ begin
       r2_seq = r2_passed_seq[seqtag]
       pid = r2_seq[0, pid_length]
       id[seqtag] = pid
-      bio_r2[seqtag] = r2_seq[filter_r2[:reverse_starting_number]..-2]
-      bio_r1[seqtag] = r1_seq[filter_r1[:forward_starting_number]..-2]
+      bio_r2[seqtag] = r2_seq[filter_r2[:reverse_starting_number]..-r2_truncate_base_number]
+      bio_r1[seqtag] = r1_seq[filter_r1[:forward_starting_number]..-r1_truncate_base_number]
     end
 
     # TCS cut-off

data/bin/tcs_log

@@ -155,7 +155,7 @@ region_colors = {"Other" => "#808080"}
 CSV.foreach(log_file).each_with_index do |row, i|
     next if i == 0 || row[0] == nil
 
-    lib_name = row[0]
+    lib_name = row[0].to_s
     region = row[1]
     raw_sequences_per_barcode = row[2].to_i
 

data/lib/viral_seq/sequence.rb

@@ -180,7 +180,7 @@ module ViralSeq
         l1 = 0
         l2 = 0
 
-        aln_seq = ViralSeq::Muscle.align(ori_ref, seq, :PPP, path_to_muscle)
+        aln_seq = ViralSeq::Muscle.align(ori_ref, seq, :Super5, path_to_muscle)
         aln_test = aln_seq[1]
         aln_test =~ /^(\-*)(\w.*\w)(\-*)$/
         gap_begin = $1.size
@@ -214,7 +214,7 @@ module ViralSeq
             l2 = l2 + (post_aln - b2)
           end
 
-          aln_seq = ViralSeq::Muscle.align(ref, seq, :PPP, path_to_muscle)
+          aln_seq = ViralSeq::Muscle.align(ref, seq, :Super5, path_to_muscle)
           aln_test = aln_seq[1]
           aln_test =~ /^(\-*)(\w.*\w)(\-*)$/
           gap_begin = $1.size
@@ -263,7 +263,7 @@ module ViralSeq
         end
 
         while repeat == 1
-          aln_seq = ViralSeq::Muscle.align(ref, seq, :PPP, path_to_muscle)
+          aln_seq = ViralSeq::Muscle.align(ref, seq, :Super5, path_to_muscle)
           aln_test = aln_seq[1]
           aln_test =~ /^(\-*)(\w.*\w)(\-*)$/
           gap_begin = $1.size
@@ -293,7 +293,7 @@ module ViralSeq
         end
         ref = ori_ref[l1..(ori_ref_l - l2 - 1)]
 
-        aln_seq = ViralSeq::Muscle.align(ref, seq, :PPP, path_to_muscle)
+        aln_seq = ViralSeq::Muscle.align(ref, seq, :Super5, path_to_muscle)
         aln_test = aln_seq[1]
         ref = aln_seq[0]
 
@@ -307,7 +307,7 @@ module ViralSeq
 
         if (ori_ref_l - l2 - 1) >= l1
           ref = ori_ref[l1..(ori_ref_l - l2 - 1)]
-          aln_seq = ViralSeq::Muscle.align(ref, seq, :PPP, path_to_muscle)
+          aln_seq = ViralSeq::Muscle.align(ref, seq, :Super5, path_to_muscle)
           aln_test = aln_seq[1]
           ref = aln_seq[0]
 

data/lib/viral_seq/string.rb

@@ -56,6 +56,43 @@ class String
     Regexp.new match
   end
 
+  # parse the nucleotide sequences as an Array of Array 
+  # @return [Array] Array of Array at each position
+  # @example parse a sequence with ambiguities to Array of Array
+  #   "ATRWCG".nt_to_array
+  #   => [["A"], ["T"], ["A", "G"], ["A", "T"], ["C"], ["G"]]
+  
+  def nt_to_array 
+    return_array = []
+    self.each_char.each do |base|
+      base_array = base.to_list
+      return_array.append base_array
+    end
+    return return_array
+  end
+
+
+  # compare the given nt sequence string with the ref sequence string
+  # @param ref [String] the ref sequence string to compare with
+  # @return [Interger] Number of differences
+  # @example parse a sequence with ambiguities to Array of Array
+  #   "ATRWCG".nt_to_array
+  #   => [["A"], ["T"], ["A", "G"], ["A", "T"], ["C"], ["G"]]
+
+  def nt_diff(ref)
+    count_diff = 0
+    self_array = self.split("")
+    ref_array = ref.nt_to_array
+    self_array.each_with_index do |nt, i|
+      ref_nt = ref_array[i]
+      unless ref_nt.include? nt
+        count_diff += 1
+      end
+    end
+    return count_diff
+  end
+
+
   # parse IUPAC nucleotide ambiguity codes (W S M K R Y B D H V N) as String if String.size == 1
   # @return [Array] parsed nt bases
   # @example parse IUPAC `R`

data/lib/viral_seq/tcs_core.rb

@@ -223,7 +223,7 @@ module ViralSeq
         end
         forward_bio_primer_size = forward_bio_primer.size
         forward_starting_number = forward_n + forward_bio_primer_size
-        forward_primer_ref = forward_bio_primer.nt_parser
+        #forward_primer_ref = forward_bio_primer.nt_parser
 
         r1_passed_seq = {}
         r1_raw = r1_sh.dna_hash
@@ -232,7 +232,7 @@ module ViralSeq
           seq = r1_raw[name]
           next unless general_filter seq
           primer_region_seq = seq[forward_n, forward_bio_primer_size]
-          if primer_region_seq =~ forward_primer_ref
+          if primer_region_seq.nt_diff(forward_bio_primer) < 3
             new_name = remove_tag name
             r1_passed_seq[new_name] = seq
           end
@@ -255,13 +255,13 @@ module ViralSeq
         cdna_bio_primer = $2
         cdna_bio_primer_size = cdna_bio_primer.size
         reverse_starting_number = pid_length + cdna_bio_primer_size
-        cdna_primer_ref = cdna_bio_primer.nt_parser
+       # cdna_primer_ref = cdna_bio_primer.nt_to_array
         r2_passed_seq = {}
         proc_filter = proc do |name|
           seq = r2_raw[name]
           next unless general_filter seq
           primer_region_seq = seq[pid_length, cdna_bio_primer_size]
-          if primer_region_seq =~ cdna_primer_ref
+          if primer_region_seq.nt_diff(cdna_bio_primer) < 4
             new_name = remove_tag name
             r2_passed_seq[new_name] = seq
           end

data/lib/viral_seq/version.rb

@@ -2,6 +2,6 @@
 # version info and histroy
 
 module ViralSeq
-  VERSION = "1.7.0"
-  TCS_VERSION = "2.5.1"
+  VERSION = "1.7.1"
+  TCS_VERSION = "2.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: viral_seq
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Shuntai Zhou
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-25 00:00:00.000000000 Z
+date: 2023-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler