pyogrio 0.7.1__cp38-cp38-win_amd64.whl → 0.8.0__cp38-cp38-win_amd64.whl

pyogrio/_ogr.pxd

@@ -12,6 +12,9 @@ cdef extern from "cpl_conv.h":
     const char* CPLFindFile(const char *pszClass, const char *filename)
     const char* CPLGetConfigOption(const char* key, const char* value)
     void        CPLSetConfigOption(const char* key, const char* value)
+    const char* CPLGetThreadLocalConfigOption(const char* key, const char* value)
+    void        CPLSetThreadLocalConfigOption(const char* key, const char* value)
+    char*       CPLStrdup(const char* string)
 
 
 cdef extern from "cpl_error.h" nogil:
@@ -42,13 +45,23 @@ cdef extern from "cpl_string.h":
 
 
 cdef extern from "cpl_vsi.h" nogil:
-
+    int VSI_STAT_EXISTS_FLAG
+    ctypedef int vsi_l_offset
     ctypedef FILE VSILFILE
+    ctypedef struct VSIStatBufL:
+        long st_size
+        long st_mode
+        int st_mtime
+
+    int         VSIFCloseL(VSILFILE *fp)
+    int         VSIFFlushL(VSILFILE *fp)
+    int         VSIUnlink(const char *path)
 
-    VSILFILE *VSIFileFromMemBuffer(const char *path, void *data,
-                                   int data_len, int take_ownership)
-    int VSIFCloseL(VSILFILE *fp)
-    int VSIUnlink(const char *path)
+    VSILFILE        *VSIFileFromMemBuffer(const char *path, void *data, vsi_l_offset data_len, int take_ownership)
+    unsigned char   *VSIGetMemFileBuffer(const char *path, vsi_l_offset *data_len, int take_ownership)
+
+    int     VSIMkdir(const char *path, long mode)
+    int     VSIRmdirRecursive(const char *pszDirname)
 
 
 cdef extern from "ogr_core.h":
@@ -190,12 +203,36 @@ cdef extern from "ogr_srs_api.h":
     void                    OSRRelease(OGRSpatialReferenceH srs)
 
 
-cdef extern from "arrow_bridge.h":
+cdef extern from "arrow_bridge.h" nogil:
+    struct ArrowArray:
+        int64_t length
+        int64_t null_count
+        int64_t offset
+        int64_t n_buffers
+        int64_t n_children
+        const void** buffers
+        ArrowArray** children
+        ArrowArray* dictionary
+        void (*release)(ArrowArray*) noexcept nogil
+        void* private_data
+
     struct ArrowSchema:
+        const char* format
+        const char* name
+        const char* metadata
+        int64_t flags
         int64_t n_children
+        ArrowSchema** children
+        ArrowSchema* dictionary
+        void (*release)(ArrowSchema*) noexcept nogil
+        void* private_data
 
     struct ArrowArrayStream:
-        int (*get_schema)(ArrowArrayStream* stream, ArrowSchema* out)
+        int (*get_schema)(ArrowArrayStream*, ArrowSchema* out) noexcept
+        int (*get_next)(ArrowArrayStream*, ArrowArray* out)
+        const char* (*get_last_error)(ArrowArrayStream*)
+        void (*release)(ArrowArrayStream*) noexcept
+        void* private_data
 
 
 cdef extern from "ogr_api.h":
@@ -205,6 +242,8 @@ cdef extern from "ogr_api.h":
     OGRDataSourceH  OGR_Dr_Open(OGRSFDriverH driver, const char *path, int bupdate)
     const char*     OGR_Dr_GetName(OGRSFDriverH driver)
 
+    const char*     OGR_DS_GetName(OGRDataSourceH)
+
     OGRFeatureH     OGR_F_Create(OGRFeatureDefnH featuredefn)
     void            OGR_F_Destroy(OGRFeatureH feature)
 
@@ -298,8 +337,6 @@ cdef extern from "ogr_api.h":
     void            OGRSetNonLinearGeometriesEnabledFlag(int bFlag)
     int             OGRGetNonLinearGeometriesEnabledFlag()
 
-    int             OGRReleaseDataSource(OGRDataSourceH ds)
-
     const char*     OLCStringsAsUTF8
     const char*     OLCRandomRead
     const char*     OLCFastSetNextByIndex
@@ -312,8 +349,14 @@ cdef extern from "ogr_api.h":
 IF CTE_GDAL_VERSION >= (3, 6, 0):
 
     cdef extern from "ogr_api.h":
-        int8_t OGR_L_GetArrowStream(OGRLayerH hLayer, ArrowArrayStream *out_stream, char** papszOptions)
+        bint OGR_L_GetArrowStream(OGRLayerH hLayer, ArrowArrayStream *out_stream, char** papszOptions)
+
 
+IF CTE_GDAL_VERSION >= (3, 8, 0):
+
+    cdef extern from "ogr_api.h":
+        bint OGR_L_CreateFieldFromArrowSchema(OGRLayerH hLayer, ArrowSchema *schema, char **papszOptions)
+        bint OGR_L_WriteArrowBatch(OGRLayerH hLayer, ArrowSchema *schema, ArrowArray *array, char **papszOptions)
 
 cdef extern from "gdal.h":
     ctypedef enum GDALDataType:
@@ -366,7 +409,6 @@ cdef extern from "gdal.h":
                                const char *const *papszOpenOptions,
                                const char *const *papszSiblingFiles)
 
-    void            GDALClose(GDALDatasetH ds)
     int             GDALDatasetGetLayerCount(GDALDatasetH ds)
     OGRLayerH       GDALDatasetGetLayer(GDALDatasetH ds, int iLayer)
     OGRLayerH       GDALDatasetGetLayerByName(GDALDatasetH ds, char * pszName)
@@ -385,4 +427,15 @@ cdef extern from "gdal.h":
     const char*     GDALVersionInfo(const char *pszRequest)
 
 
-cdef get_string(const char *c_str, str encoding=*)
+# GDALClose returns error code for >= 3.7.0
+IF CTE_GDAL_VERSION >= (3, 7, 0):
+
+    cdef extern from "ogr_api.h":
+        int GDALClose(GDALDatasetH ds)
+ELSE:
+
+    cdef extern from "ogr_api.h":
+        void GDALClose(GDALDatasetH ds)
+
+
+cdef get_string(const char *c_str, str encoding=*)

pyogrio/_ogr.pyx

@@ -108,6 +108,14 @@ def ogr_driver_supports_write(driver):
     return False
 
 
+def ogr_driver_supports_vsi(driver):
+    # check metadata for driver to see if it supports write
+    if _get_driver_metadata_item(driver, "DCAP_VIRTUALIO") == 'YES':
+        return True
+
+    return False
+
+
 def ogr_list_drivers():
     cdef OGRSFDriverH driver = NULL
     cdef int i
@@ -129,30 +137,6 @@ def ogr_list_drivers():
     return drivers
 
 
-def buffer_to_virtual_file(bytesbuf, ext=''):
-    """Maps a bytes buffer to a virtual file.
-    `ext` is empty or begins with a period and contains at most one period.
-
-    This (and remove_virtual_file) is originally copied from the Fiona project
-    (https://github.com/Toblerity/Fiona/blob/c388e9adcf9d33e3bb04bf92b2ff210bbce452d9/fiona/ogrext.pyx#L1863-L1879)
-    """
-
-    vsi_filename = f"/vsimem/{uuid4().hex + ext}"
-
-    vsi_handle = VSIFileFromMemBuffer(vsi_filename.encode("UTF-8"), <unsigned char *>bytesbuf, len(bytesbuf), 0)
-
-    if vsi_handle == NULL:
-        raise OSError('failed to map buffer to file')
-    if VSIFCloseL(vsi_handle) != 0:
-        raise OSError('failed to close mapped file handle')
-
-    return vsi_filename
-
-
-def remove_virtual_file(vsi_filename):
-    return VSIUnlink(vsi_filename.encode("UTF-8"))
-
-
 cdef void set_proj_search_path(str path):
     """Set PROJ library data file search path for use in GDAL."""
     cdef char **paths = NULL

pyogrio/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2023-10-26T15:56:41-0700",
+ "date": "2024-05-06T14:34:51-0700",
  "dirty": false,
  "error": null,
- "full-revisionid": "97d9dee48584208ccbb479b87d58ec1eb92b3f9c",
- "version": "0.7.1"
+ "full-revisionid": "46c35a7e98d85923cfefe73dae7285404e72d9a6",
+ "version": "0.8.0"
 }
 '''  # END VERSION_JSON