polars-df 0.2.2-arm64-darwin → 0.2.4-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 150683cf56be275cc1402ec229d5fd1c1ba0831bc08e0f6e22265e987ae8b5c7
-  data.tar.gz: 6cd2016e5ea8b09bb9812132a176c23970c5e1b205b12c7d0c94648b54f36879
+  metadata.gz: dcfc25e89d7a425959a2f4f9c6abd4afb8b73199e20d6dfb343553c5b6c59440
+  data.tar.gz: dfae2afdbbd51f2a0bfde98605ee26d6af33278b341864df61f999c6fe8b302d
 SHA512:
-  metadata.gz: 2d47f4040eb157a13fbc59bfbcfce3c7e4eea6eb944a7b1194564a6623af06fd99d7d4adcf3db867e962cb313208834107e05458cfac744ef2b76b28b71b2749
-  data.tar.gz: 11583170cab8559577cfff9be52466a4adddffe69c740b36604f2445d31ca0fea00535e05845d0a956de3c2012a99862d7f70d22177e6202a5a4e2d283377b56
+  metadata.gz: 2f5202f94da45aeffc7d6ef8911d030713a2abe5d578f2bb27ecd661b20ede440b19ac88a09b9407b856d1e07adc30cea4a0e79676b93cc9ef9554f6751bde3c
+  data.tar.gz: 0fa9eb632c0ce1ad3329cf7b496f1707ddb7763f0f61d106fcfde36be944e69cf4b70fcc4758c967bfa178b71aaef67e972843d92945cb5f002a876f73697f71

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.2.4 (2023-01-29)
+
+- Added support for more types when creating a data frame from an array of hashes
+
+## 0.2.3 (2023-01-22)
+
+- Fixed error with precompiled gem on Mac ARM
+- Fixed issue with structs
+
 ## 0.2.2 (2023-01-20)
 
 - Added support for strings to `read_sql` method

data/Cargo.lock

@@ -1367,7 +1367,7 @@ dependencies = [
 
 [[package]]
 name = "polars"
-version = "0.2.2"
+version = "0.2.4"
 dependencies = [
  "ahash",
  "jemallocator",
@@ -1653,18 +1653,18 @@ dependencies = [
 
 [[package]]
 name = "rb-sys"
-version = "0.9.56"
+version = "0.9.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef82428221475c6f9e7893fe30b88d45ac86bdb12e58e7c92055ba4bceb78a69"
+checksum = "0158f5115e1ad04a2ee231f597e86306af96f36a8b93ac0c01f8852d0ba89278"
 dependencies = [
  "rb-sys-build",
 ]
 
 [[package]]
 name = "rb-sys-build"
-version = "0.9.56"
+version = "0.9.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "950bfc239d2e7704576abe4d37b008876bbfd70a99196a188c5caeae2ba7344a"
+checksum = "6c27b779db4a2863db74ddad0011f0d0c55c528e9601126d4613ad688063bc05"
 dependencies = [
  "bindgen",
  "regex",
@@ -1673,9 +1673,9 @@ dependencies = [
 
 [[package]]
 name = "rb-sys-env"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74c38752410925faeb82c400c06ba2fd9ee6aa8f719dd33994c9e53f5242d25f"
+checksum = "a35802679f07360454b418a5d1735c89716bde01d35b1560fc953c1415a0b3bb"
 
 [[package]]
 name = "redox_syscall"

data/LICENSE-THIRD-PARTY.txt

@@ -586,15 +586,15 @@ rayon-core v1.10.1
 https://github.com/rayon-rs/rayon
 MIT OR Apache-2.0
 
-rb-sys v0.9.56
+rb-sys v0.9.58
 https://github.com/oxidize-rb/rb-sys
 MIT OR Apache-2.0
 
-rb-sys-build v0.9.56
+rb-sys-build v0.9.58
 https://github.com/oxidize-rb/rb-sys
 MIT OR Apache-2.0
 
-rb-sys-env v0.1.1
+rb-sys-env v0.1.2
 https://github.com/oxidize-rb/rb-sys
 MIT OR Apache-2.0
 
@@ -30064,32 +30064,6 @@ 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
 ================================================================================
@@ -30285,6 +30259,32 @@ 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

@@ -56,6 +56,8 @@ From Active Record
 
 ```ruby
 Polars.read_sql(User.all)
+# or
+Polars.read_sql("SELECT * FROM users")
 ```
 
 From a hash
@@ -67,6 +69,16 @@ Polars::DataFrame.new({
 })
 ```
 
+From an array of hashes
+
+```ruby
+Polars::DataFrame.new([
+  {"a" => 1, "b" => "one"},
+  {"a" => 2, "b" => "two"},
+  {"a" => 3, "b" => "three"}
+])
+```
+
 From an array of series
 
 ```ruby
@@ -287,13 +299,13 @@ CSV
 ```ruby
 df.to_csv
 # or
-df.write_csv("data.csv")
+df.write_csv("file.csv")
 ```
 
 Parquet
 
 ```ruby
-df.write_parquet("data.parquet")
+df.write_parquet("file.parquet")
 ```
 
 ## Types

data/lib/polars/data_frame.rb

@@ -4746,7 +4746,14 @@ module Polars
     end
 
     # @private
-    def self._unpack_columns(columns, lookup_names: nil, n_expected: nil)
+    def self.include_unknowns(schema, cols)
+      cols.to_h { |col| [col, schema.fetch(col, Unknown)] }
+    end
+
+    # @private
+    def self._unpack_columns(columns, schema_overrides: nil, lookup_names: nil, n_expected: nil)
+      raise Todo if schema_overrides
+
       if columns.is_a?(Hash)
         columns = columns.to_a
       end
@@ -4790,8 +4797,48 @@ module Polars
       end
     end
 
+    def self._post_apply_columns(rbdf, columns, structs: nil, schema_overrides: nil)
+      rbdf_columns = rbdf.columns
+      rbdf_dtypes = rbdf.dtypes
+      columns, dtypes = _unpack_columns(
+        (columns || rbdf_columns), schema_overrides: schema_overrides
+      )
+      column_subset = []
+      if columns != rbdf_columns
+        if columns.length < rbdf_columns.length && columns == rbdf_columns.first(columns.length)
+          column_subset = columns
+        else
+          rbdf.set_column_names(columns)
+        end
+      end
+
+      column_casts = []
+      columns.each do |col, i|
+        if dtypes[col] == Categorical # != rbdf_dtypes[i]
+          column_casts << Polars.col(col).cast(Categorical)._rbexpr
+        elsif structs.any? && structs.include?(col) && structs[col] != rbdf_dtypes[i]
+          column_casts << Polars.col(col).cast(structs[col])._rbexpr
+        elsif dtypes.include?(col) && dtypes[col] != rbdf_dtypes[i]
+          column_casts << Polars.col(col).cast(dtypes[col])._rbexpr
+        end
+      end
+
+      if column_casts.any? || column_subset.any?
+        rbdf = rbdf.lazy
+        if column_casts.any?
+          rbdf = rbdf.with_columns(column_casts)
+        end
+        if column_subset.any?
+          rbdf = rbdf.select(column_subset.map { |col| Polars.col(col)._rbexpr })
+        end
+        rbdf = rbdf.collect
+      end
+
+      rbdf
+    end
+
     # @private
-    def self.sequence_to_rbdf(data, columns: nil, orient: nil)
+    def self.sequence_to_rbdf(data, columns: nil, orient: nil, infer_schema_length: 50)
       if data.length == 0
         return hash_to_rbdf({}, columns: columns)
       end
@@ -4803,6 +4850,14 @@ module Polars
         data.each do |s|
           data_series << s._s
         end
+      elsif data[0].is_a?(Hash)
+        column_names, dtypes = _unpack_columns(columns)
+        schema_overrides = dtypes ? include_unknowns(dtypes, column_names) : nil
+        rbdf = RbDataFrame.read_hashes(data, infer_schema_length, schema_overrides)
+        if column_names
+          rbdf = _post_apply_columns(rbdf, column_names)
+        end
+        return rbdf
       elsif data[0].is_a?(Array)
         if orient.nil? && !columns.nil?
           orient = columns.length == data.length ? "col" : "row"

data/lib/polars/data_types.rb

@@ -3,44 +3,64 @@ module Polars
   class DataType
   end
 
+  # Base class for numeric data types.
+  class NumericType < DataType
+  end
+
+  # Base class for integral data types.
+  class IntegralType < NumericType
+  end
+
+  # Base class for fractional data types.
+  class FractionalType < NumericType
+  end
+
+  # Base class for temporal data types.
+  class TemporalType < DataType
+  end
+
+  # Base class for nested data types.
+  class NestedType < DataType
+  end
+
   # 8-bit signed integer type.
-  class Int8 < DataType
+  class Int8 < IntegralType
   end
 
   # 16-bit signed integer type.
-  class Int16 < DataType
+  class Int16 < IntegralType
   end
 
   # 32-bit signed integer type.
-  class Int32 < DataType
+  class Int32 < IntegralType
   end
 
   # 64-bit signed integer type.
-  class Int64 < DataType
+  class Int64 < IntegralType
   end
 
   # 8-bit unsigned integer type.
-  class UInt8 < DataType
+  class UInt8 < IntegralType
   end
 
   # 16-bit unsigned integer type.
-  class UInt16 < DataType
+  class UInt16 < IntegralType
   end
 
   # 32-bit unsigned integer type.
-  class UInt32 < DataType
+  class UInt32 < IntegralType
   end
 
   # 64-bit unsigned integer type.
-  class UInt64 < DataType
+  class UInt64 < IntegralType
   end
 
   # 32-bit floating point type.
-  class Float32 < DataType
+  class Float32 < FractionalType
   end
 
   # 64-bit floating point type.
-  class Float64 < DataType
+  class Float64 < FractionalType
   end
 
   # Boolean type.
@@ -51,31 +71,19 @@ module Polars
   class Utf8 < DataType
   end
 
-  # Binary type.
-  class Binary < DataType
-  end
-
-  # Type representing Null / None values.
-  class Null < DataType
-  end
-
-  # Type representing Datatype values that could not be determined statically.
-  class Unknown < DataType
-  end
-
   # Nested list/array type.
-  class List < DataType
+  class List < NestedType
     def initialize(inner)
       @inner = Utils.rb_type_to_dtype(inner)
     end
   end
 
   # Calendar date type.
-  class Date < DataType
+  class Date < TemporalType
   end
 
   # Calendar date and time type.
-  class Datetime < DataType
+  class Datetime < TemporalType
     def initialize(time_unit = "us", time_zone = nil)
       @tu = time_unit || "us"
       @time_zone = time_zone
@@ -83,14 +91,14 @@ module Polars
   end
 
   # Time duration/delta type.
-  class Duration < DataType
+  class Duration < TemporalType
     def initialize(time_unit = "us")
       @tu = time_unit
     end
   end
 
   # Time of day type.
-  class Time < DataType
+  class Time < TemporalType
   end
 
   # Type for wrapping arbitrary Ruby objects.
@@ -102,15 +110,24 @@ module Polars
   end
 
   # Definition of a single field within a `Struct` DataType.
-  class Field < DataType
+  class Field
+    attr_reader :name, :dtype
+
     def initialize(name, dtype)
       @name = name
       @dtype = Utils.rb_type_to_dtype(dtype)
     end
+
+    def inspect
+      class_name = self.class.name
+      "#{class_name}(#{@name}: #{@dtype})"
+    end
   end
 
   # Struct composite type.
-  class Struct < DataType
+  class Struct < NestedType
+    attr_reader :fields
+
     def initialize(fields)
       if fields.is_a?(Hash)
         @fields = fields.map { |n, d| Field.new(n, d) }
@@ -118,5 +135,26 @@ module Polars
         @fields = fields
       end
     end
+
+    def inspect
+      class_name = self.class.name
+      "#{class_name}(#{@fields})"
+    end
+
+    def to_schema
+      @fields.to_h { |f| [f.name, f.dtype] }
+    end
+  end
+
+  # Binary type.
+  class Binary < DataType
+  end
+
+  # Type representing Null / None values.
+  class Null < DataType
+  end
+
+  # Type representing Datatype values that could not be determined statically.
+  class Unknown < DataType
   end
 end

data/lib/polars/series.rb

@@ -3667,6 +3667,11 @@ module Polars
       rb_temporal_types << ::Time if defined?(::Time)
 
       value = _get_first_non_none(values)
+      if !value.nil?
+        if value.is_a?(Hash)
+          return DataFrame.new(values).to_struct(name)._s
+        end
+      end
 
       if !dtype.nil? && Utils.is_polars_dtype(dtype) && ruby_dtype.nil?
         constructor = polars_type_to_constructor(dtype)

data/lib/polars/utils.rb

@@ -160,11 +160,11 @@ module Polars
 
     def self.scale_bytes(sz, to:)
       scaling_factor = {
-          "b" => 1,
-          "k" => 1024,
-          "m" => 1024 ** 2,
-          "g" => 1024 ** 3,
-          "t" => 1024 ** 4,
+        "b" => 1,
+        "k" => 1024,
+        "m" => 1024 ** 2,
+        "g" => 1024 ** 3,
+        "t" => 1024 ** 4
       }[to[0]]
       if scaling_factor > 1
         sz / scaling_factor.to_f

data/lib/polars/version.rb

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

data/lib/polars-df.rb

@@ -1 +1 @@
-require "polars"
+require_relative "polars"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polars-df
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: arm64-darwin
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-20 00:00:00.000000000 Z
+date: 2023-01-30 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: andrew@ankane.org