polars-df 0.2.1-x86_64-darwin → 0.2.2-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee93a61f42e0acf492693c5516582437239b66b29a411d49a61e43ee2c640bf0
-  data.tar.gz: e79a6954afbf9e66bb1b73410abdc750fd5ee7bdca289ae7aa31607608c120f1
+  metadata.gz: 8f2791c0d21e29dda330d14874b48d97476fa978a59ea032cef261b1a1bf7ed1
+  data.tar.gz: 0f1cf1de038b52be6bdd7fe17edec67c30640026dc77c1c63788ffa9f226cb7e
 SHA512:
-  metadata.gz: 6679b43359387e0f6688c3d96337ffb7408e58296f16524708748feb4c57ff396b439d3a24a79f0c913dd252f920fb3f42be1bc5a0be364ee6aa66c094107ccf
-  data.tar.gz: 80f69ce23c42d4dd3345bd8364f689af571284ba95770d32be4760a99a9b0eb7cb7b21892c326321c0db33b6bffc57e4a19c989b8044878ef7e42aeffe3d7f68
+  metadata.gz: 4b3af7d10ceadd9bc4f4d0d0d286efb5b2002a1bd02ba1004ce0ed616ded94971dfc08dc7ba00db885c90fdef948e3fa034f8735d6ff68bd253a10355200fc65
+  data.tar.gz: 22a67553be610272d81dace623a8035c45da63bb8c05b866c636a581921a70f1ff0bef84a1d84aa65c4c9d6ed50fc4d31f214aab5221dd1becef8aec6a5a2e68

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.2 (2023-01-20)
+
+- Added support for strings to `read_sql` method
+- Improved indexing
+- Fixed error with precompiled gem on Mac ARM
+
 ## 0.2.1 (2023-01-18)
 
 - Added `read_sql` method

data/Cargo.lock

@@ -1367,7 +1367,7 @@ dependencies = [
 
 [[package]]
 name = "polars"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "ahash",
  "jemallocator",

data/LICENSE-THIRD-PARTY.txt

@@ -1640,6 +1640,33 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
 IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 
+================================================================================
+array-init-cursor LICENSE-MIT
+================================================================================
+
+MIT License
+
+Copyright (c) 2021 The Planus Project Developers
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
 ================================================================================
 array-init-cursor LICENSE-APACHE
 ================================================================================
@@ -1822,33 +1849,6 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 END OF TERMS AND CONDITIONS
 
 
-================================================================================
-array-init-cursor LICENSE-MIT
-================================================================================
-
-MIT License
-
-Copyright (c) 2021 The Planus Project Developers
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
 ================================================================================
 arrow-format LICENSE
 ================================================================================
@@ -27103,6 +27103,33 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
 IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 
+================================================================================
+planus LICENSE-MIT
+================================================================================
+
+MIT License
+
+Copyright (c) 2021 The Planus Project Developers
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
 ================================================================================
 planus LICENSE-APACHE
 ================================================================================
@@ -27285,33 +27312,6 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 END OF TERMS AND CONDITIONS
 
 
-================================================================================
-planus LICENSE-MIT
-================================================================================
-
-MIT License
-
-Copyright (c) 2021 The Planus Project Developers
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
 ================================================================================
 polars LICENSE
 ================================================================================
@@ -30064,6 +30064,32 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
+================================================================================
+rb-sys-env LICENSE-MIT
+================================================================================
+
+The MIT License (MIT)
+
+Copyright (c) 2021-2022 Ian Ker-Seymer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
 ================================================================================
 rb-sys-env LICENSE-APACHE
 ================================================================================
@@ -30259,32 +30285,6 @@ rb-sys-env LICENSE-APACHE
    See the License for the specific language governing permissions and
    limitations under the License.
 
-================================================================================
-rb-sys-env LICENSE-MIT
-================================================================================
-
-The MIT License (MIT)
-
-Copyright (c) 2021-2022 Ian Ker-Seymer
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
 ================================================================================
 regex LICENSE-APACHE
 ================================================================================

data/README.md

@@ -41,6 +41,9 @@ From a CSV
 
 ```ruby
 Polars.read_csv("file.csv")
+
+# or lazily with
+Polars.scan_csv("file.csv")
 ```
 
 From Parquet
@@ -135,9 +138,9 @@ df[Polars.col("a") <= 2]
 And, or, and exclusive or
 
 ```ruby
-df[(Polars.col("a") > 100) & (Polars.col("b") == "one")] # and
-df[(Polars.col("a") > 100) | (Polars.col("b") == "one")] # or
-df[(Polars.col("a") > 100) ^ (Polars.col("b") == "one")] # xor
+df[(Polars.col("a") > 1) & (Polars.col("b") == "two")] # and
+df[(Polars.col("a") > 1) | (Polars.col("b") == "two")] # or
+df[(Polars.col("a") > 1) ^ (Polars.col("b") == "two")] # xor
 ```
 
 ## Operations

data/lib/polars/data_frame.rb

@@ -277,6 +277,7 @@ module Polars
       _df.height
     end
     alias_method :count, :height
+    alias_method :length, :height
 
     # Get the width of the DataFrame.
     #
@@ -541,7 +542,7 @@ module Polars
 
         if col_selection.is_a?(Array)
           # df[.., [1, 2]]
-          if is_int_sequence(col_selection)
+          if Utils.is_int_sequence(col_selection)
             series_list = col_selection.map { |i| to_series(i) }
             df = self.class.new(series_list)
             return df[row_selection]
@@ -574,6 +575,23 @@ module Polars
           # df[["foo", "bar"]]
           return _from_rbdf(_df.select(item))
         end
+
+        if Utils.is_int_sequence(item)
+          item = Series.new("", item)
+        end
+
+        if item.is_a?(Series)
+          dtype = item.dtype
+          if dtype == Utf8
+            return _from_rbdf(_df.select(item))
+          elsif dtype == UInt32
+            return _from_rbdf(_df.take_with_series(item._s))
+          elsif [UInt8, UInt16, UInt64, Int8, Int16, Int32, Int64].include?(dtype)
+            return _from_rbdf(
+              _df.take_with_series(_pos_idxs(item, 0)._s)
+            )
+          end
+        end
       end
 
       # Ruby-specific
@@ -4662,8 +4680,53 @@ module Polars
       end
     end
 
-    # def _pos_idxs
-    # end
+    def _pos_idxs(idxs, dim)
+      idx_type = Polars._get_idx_type
+
+      if idxs.is_a?(Series)
+        if idxs.dtype == idx_type
+          return idxs
+        end
+        if [UInt8, UInt16, idx_type == UInt32 ? UInt64 : UInt32, Int8, Int16, Int32, Int64].include?(idxs.dtype)
+          if idx_type == UInt32
+            if [Int64, UInt64].include?(idxs.dtype)
+              if idxs.max >= 2**32
+                raise ArgumentError, "Index positions should be smaller than 2^32."
+              end
+            end
+            if idxs.dtype == Int64
+              if idxs.min < -(2**32)
+                raise ArgumentError, "Index positions should be bigger than -2^32 + 1."
+              end
+            end
+          end
+          if [Int8, Int16, Int32, Int64].include?(idxs.dtype)
+            if idxs.min < 0
+              if idx_type == UInt32
+                if [Int8, Int16].include?(idxs.dtype)
+                  idxs = idxs.cast(Int32)
+                end
+              else
+                if [Int8, Int16, Int32].include?(idxs.dtype)
+                  idxs = idxs.cast(Int64)
+                end
+              end
+
+              idxs =
+                Polars.select(
+                  Polars.when(Polars.lit(idxs) < 0)
+                    .then(shape[dim] + Polars.lit(idxs))
+                    .otherwise(Polars.lit(idxs))
+                ).to_series
+            end
+          end
+
+          return idxs.cast(idx_type)
+        end
+      end
+
+      raise ArgumentError, "Unsupported idxs datatype."
+    end
 
     # @private
     def self.hash_to_rbdf(data, columns: nil)

data/lib/polars/io.rb

@@ -606,8 +606,10 @@ module Polars
           sql
         elsif sql.is_a?(ActiveRecord::Relation)
           sql.connection.select_all(sql.to_sql)
+        elsif sql.is_a?(String)
+          ActiveRecord::Base.connection.select_all(sql)
         else
-          raise ArgumentError, "Expected ActiveRecord::Relation or ActiveRecord::Result"
+          raise ArgumentError, "Expected ActiveRecord::Relation, ActiveRecord::Result, or String"
         end
       data = {}
       result.columns.each_with_index do |k, i|

data/lib/polars/series.rb

@@ -263,6 +263,10 @@ module Polars
     #
     # @return [Object]
     def [](item)
+      if item.is_a?(Series) && [UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64].include?(item.dtype)
+        return Utils.wrap_s(_s.take_with_series(_pos_idxs(item)._s))
+      end
+
       if item.is_a?(Integer)
         return _s.get_idx(item)
       end
@@ -271,6 +275,10 @@ module Polars
         return Slice.new(self).apply(item)
       end
 
+      if Utils.is_int_sequence(item)
+        return Utils.wrap_s(_s.take_with_series(_pos_idxs(Series.new("", item))._s))
+      end
+
       raise ArgumentError, "Cannot get item of type: #{item.class.name}"
     end
 
@@ -287,24 +295,23 @@ module Polars
       end
 
       if key.is_a?(Series)
-        if key.dtype == :bool
+        if key.dtype == Boolean
           self._s = set(key, value)._s
-        elsif key.dtype == :u64
-          self._s = set_at_idx(key.cast(:u32), value)._s
-        elsif key.dtype == :u32
+        elsif key.dtype == UInt64
+          self._s = set_at_idx(key.cast(UInt32), value)._s
+        elsif key.dtype == UInt32
           self._s = set_at_idx(key, value)._s
         else
           raise Todo
         end
-      end
-
-      if key.is_a?(Array)
-        s = Utils.wrap_s(sequence_to_rbseries("", key, dtype: :u32))
+      elsif key.is_a?(Array)
+        s = Utils.wrap_s(sequence_to_rbseries("", key, dtype: UInt32))
+        self[s] = value
+      elsif key.is_a?(Range)
+        s = Series.new("", key, dtype: UInt32)
         self[s] = value
       elsif key.is_a?(Integer)
-        # TODO fix
-        # self[[key]] = value
-        set_at_idx(key, value)
+        self[[key]] = value
       else
         raise ArgumentError, "cannot use #{key} for indexing"
       end
@@ -3527,6 +3534,59 @@ module Polars
       end
     end
 
+    def _pos_idxs(idxs)
+      idx_type = Polars._get_idx_type
+
+      if idxs.is_a?(Series)
+        if idxs.dtype == idx_type
+          return idxs
+        end
+        if [UInt8, UInt16, idx_type == UInt32 ? UInt64 : UInt32, Int8, Int16, Int32, Int64].include?(idxs.dtype)
+          if idx_type == UInt32
+            if [Int64, UInt64].include?(idxs.dtype)
+              if idxs.max >= 2**32
+                raise ArgumentError, "Index positions should be smaller than 2^32."
+              end
+            end
+            if idxs.dtype == Int64
+              if idxs.min < -(2**32)
+                raise ArgumentError, "Index positions should be bigger than -2^32 + 1."
+              end
+            end
+          end
+          if [Int8, Int16, Int32, Int64].include?(idxs.dtype)
+            if idxs.min < 0
+              if idx_type == UInt32
+                if [Int8, Int16].include?(idxs.dtype)
+                  idxs = idxs.cast(Int32)
+                end
+              else
+                if [Int8, Int16, Int32].include?(idxs.dtype)
+                  idxs = idxs.cast(Int64)
+                end
+              end
+
+              # Update negative indexes to absolute indexes.
+              return (
+                idxs.to_frame
+                .select(
+                  Polars.when(Polars.col(idxs.name) < 0)
+                    .then(len + Polars.col(idxs.name))
+                    .otherwise(Polars.col(idxs.name))
+                    .cast(idx_type)
+                )
+                .to_series(0)
+              )
+            end
+          end
+
+          return idxs.cast(idx_type)
+        end
+      end
+
+      raise ArgumentError, "Unsupported idxs datatype."
+    end
+
     def _comp(other, op)
       if other.is_a?(Series)
         return Utils.wrap_s(_s.send(op, other._s))

data/lib/polars/slice.rb

@@ -56,7 +56,7 @@ module Polars
     # Normalize slice bounds, identify unbounded and/or zero-length slices.
     def _slice_setup(s)
       # can normalize slice indices as we know object size
-      obj_len = @obj.len
+      obj_len = @obj.length
       start = if s.begin
         if s.begin < 0
           [s.begin + obj_len, 0].max

data/lib/polars/utils.rb

@@ -181,6 +181,26 @@ module Polars
       val.all? { |x| x.is_a?(eltype) }
     end
 
+    def self.is_bool_sequence(val)
+      val.is_a?(Array) && val.all? { |x| x == true || x == false }
+    end
+
+    def self.is_dtype_sequence(val)
+      val.is_a?(Array) && val.all? { |x| is_polars_dtype(x) }
+    end
+
+    def self.is_int_sequence(val)
+      val.is_a?(Array) && _is_iterable_of(val, Integer)
+    end
+
+    def self.is_expr_sequence(val)
+      val.is_a?(Array) && _is_iterable_of(val, Expr)
+    end
+
+    def self.is_rbexpr_sequence(val)
+      val.is_a?(Array) && _is_iterable_of(val, RbExpr)
+    end
+
     def self.is_str_sequence(val, allow_str: false)
       if allow_str == false && val.is_a?(String)
         false

data/lib/polars/version.rb

@@ -1,4 +1,4 @@
 module Polars
   # @private
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polars-df
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: x86_64-darwin
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-18 00:00:00.000000000 Z
+date: 2023-01-20 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: andrew@ankane.org
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.3
+rubygems_version: 3.4.4
 signing_key: 
 specification_version: 4
 summary: Blazingly fast DataFrames for Ruby